diff --git a/indra/newview/shfloatermediaticker.cpp b/indra/newview/shfloatermediaticker.cpp index 33907bb21..9a36746f8 100644 --- a/indra/newview/shfloatermediaticker.cpp +++ b/indra/newview/shfloatermediaticker.cpp @@ -23,8 +23,11 @@ SHFloaterMediaTicker::SHFloaterMediaTicker() : LLFloater()/*, LLSingletonbuildFloater(this, "sh_floater_media_ticker.xml"); + setIsChrome(TRUE); + if(gAudiop->getStreamingAudioImpl()->supportsWaveData()) + LLUICtrlFactory::getInstance()->buildFloater(this, "sh_floater_media_ticker_visualizer.xml"); + else + LLUICtrlFactory::getInstance()->buildFloater(this, "sh_floater_media_ticker.xml"); } /*virtual*/ BOOL SHFloaterMediaTicker::postBuild() @@ -35,26 +38,11 @@ SHFloaterMediaTicker::SHFloaterMediaTicker() : LLFloater()/*, LLSingleton("visualizer_box",true,false); mszLoading = getString("loading"); mszPaused = getString("paused"); + mOscillatorColor = gColors.getColor("SHMediaTickerOscillatorColor"); if(mArtistText) mArtistText->setText(mszPaused); if(mTitleText) mTitleText->setText(mszPaused); - if(!gAudiop->getStreamingAudioImpl()->supportsWaveData()) //Can't visualize. Extend textboxes. - { - if(mArtistText) - { - LLRect text_rect = mArtistText->getRect(); - text_rect.mRight = llmax(mTickerBackground->getRect().mRight-2,text_rect.mRight); - mArtistText->setRect(text_rect); - } - if(mTitleText) - { - LLRect text_rect = mTitleText->getRect(); - text_rect.mRight = llmax(mTickerBackground->getRect().mRight-2,text_rect.mRight); - mArtistText->setRect(text_rect); - } - } - return LLFloater::postBuild(); } @@ -125,7 +113,7 @@ void SHFloaterMediaTicker::drawOscilloscope() //called via draw. F32 width_scale = root_rect.getWidth() / (F32)NUM_WAVE_DATA_VALUES; gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - gGL.color4f(0.f,0.f,0.f,.75f); + gGL.color4fv(mOscillatorColor.mV); gGL.pushMatrix(); gGL.translatef((F32)root_rect.mLeft, (F32)root_rect.mBottom + height*.5f, 0.f); gGL.begin( LLRender::LINE_STRIP ); diff --git a/indra/newview/shfloatermediaticker.h b/indra/newview/shfloatermediaticker.h index cfc0475e7..6a5470d6e 100644 --- a/indra/newview/shfloatermediaticker.h +++ b/indra/newview/shfloatermediaticker.h @@ -41,6 +41,8 @@ private: S32 mTitleScrollChars; S32 mCurScrollChar; + LLColor4 mOscillatorColor; + //UI elements LLIconCtrl* mTickerBackground; LLTextBox* mArtistText; diff --git a/indra/newview/skins/Pony-Aquablue/colors_base.xml b/indra/newview/skins/Pony-Aquablue/colors_base.xml index f77e42294..b48208f68 100644 --- a/indra/newview/skins/Pony-Aquablue/colors_base.xml +++ b/indra/newview/skins/Pony-Aquablue/colors_base.xml @@ -183,6 +183,7 @@ + diff --git a/indra/newview/skins/Pony-Purple/colors_base.xml b/indra/newview/skins/Pony-Purple/colors_base.xml index 360f33104..8cde4c258 100644 --- a/indra/newview/skins/Pony-Purple/colors_base.xml +++ b/indra/newview/skins/Pony-Purple/colors_base.xml @@ -184,6 +184,7 @@ + diff --git a/indra/newview/skins/dark/colors_base.xml b/indra/newview/skins/dark/colors_base.xml index 8e758b6cb..032351a88 100644 --- a/indra/newview/skins/dark/colors_base.xml +++ b/indra/newview/skins/dark/colors_base.xml @@ -181,6 +181,7 @@ + diff --git a/indra/newview/skins/darkgred/colors_base.xml b/indra/newview/skins/darkgred/colors_base.xml index d7c76b5eb..d7132d44d 100644 --- a/indra/newview/skins/darkgred/colors_base.xml +++ b/indra/newview/skins/darkgred/colors_base.xml @@ -181,6 +181,7 @@ + diff --git a/indra/newview/skins/darkorange/colors_base.xml b/indra/newview/skins/darkorange/colors_base.xml index 6ccefdf5c..f3ff107f0 100644 --- a/indra/newview/skins/darkorange/colors_base.xml +++ b/indra/newview/skins/darkorange/colors_base.xml @@ -184,6 +184,7 @@ + diff --git a/indra/newview/skins/default/colors_base.xml b/indra/newview/skins/default/colors_base.xml index d71dbe7aa..eafb95481 100644 --- a/indra/newview/skins/default/colors_base.xml +++ b/indra/newview/skins/default/colors_base.xml @@ -195,6 +195,7 @@ + diff --git a/indra/newview/skins/default/textures/ticker_visualizer_grid.tga b/indra/newview/skins/default/textures/ticker_visualizer_grid.tga new file mode 100644 index 000000000..a7bb07b4e Binary files /dev/null and b/indra/newview/skins/default/textures/ticker_visualizer_grid.tga differ diff --git a/indra/newview/skins/default/xui/en-us/sh_floater_media_ticker.xml b/indra/newview/skins/default/xui/en-us/sh_floater_media_ticker.xml index f95f2d09f..d002b1cc5 100644 --- a/indra/newview/skins/default/xui/en-us/sh_floater_media_ticker.xml +++ b/indra/newview/skins/default/xui/en-us/sh_floater_media_ticker.xml @@ -1,20 +1,23 @@ - + Artist: + mouse_opaque="true" name="artist_text" v_pad="0" width="185"> + mouse_opaque="true" name="title_text" v_pad="0" width="185"> - - (not playing) diff --git a/indra/newview/skins/default/xui/en-us/sh_floater_media_ticker_visualizer.xml b/indra/newview/skins/default/xui/en-us/sh_floater_media_ticker_visualizer.xml new file mode 100644 index 000000000..e26e56e0c --- /dev/null +++ b/indra/newview/skins/default/xui/en-us/sh_floater_media_ticker_visualizer.xml @@ -0,0 +1,44 @@ + + + + + + + + Artist: + + + + + Title: + + + + + + (not playing) + + + (loading...) + + diff --git a/indra/newview/skins/emerald/colors_base.xml b/indra/newview/skins/emerald/colors_base.xml index 0ae266670..57f34271a 100644 --- a/indra/newview/skins/emerald/colors_base.xml +++ b/indra/newview/skins/emerald/colors_base.xml @@ -182,6 +182,7 @@ + diff --git a/indra/newview/skins/gemini/colors_base.xml b/indra/newview/skins/gemini/colors_base.xml index 529d37fea..6e2eb7075 100644 --- a/indra/newview/skins/gemini/colors_base.xml +++ b/indra/newview/skins/gemini/colors_base.xml @@ -184,6 +184,7 @@ + diff --git a/indra/newview/skins/gred/colors_base.xml b/indra/newview/skins/gred/colors_base.xml index 64130c117..6ecb33e97 100644 --- a/indra/newview/skins/gred/colors_base.xml +++ b/indra/newview/skins/gred/colors_base.xml @@ -181,6 +181,7 @@ + diff --git a/indra/newview/skins/kdarknv/colors_base.xml b/indra/newview/skins/kdarknv/colors_base.xml index 5d33dd652..477527766 100644 --- a/indra/newview/skins/kdarknv/colors_base.xml +++ b/indra/newview/skins/kdarknv/colors_base.xml @@ -183,6 +183,7 @@ + diff --git a/indra/newview/skins/kliteat/colors_base.xml b/indra/newview/skins/kliteat/colors_base.xml index 5d33dd652..477527766 100644 --- a/indra/newview/skins/kliteat/colors_base.xml +++ b/indra/newview/skins/kliteat/colors_base.xml @@ -183,6 +183,7 @@ + diff --git a/indra/newview/skins/openlife/colors_base.xml b/indra/newview/skins/openlife/colors_base.xml index 3b85efa77..39f897639 100644 --- a/indra/newview/skins/openlife/colors_base.xml +++ b/indra/newview/skins/openlife/colors_base.xml @@ -171,6 +171,7 @@ + diff --git a/indra/newview/skins/openlife/textures/colors_base.xml b/indra/newview/skins/openlife/textures/colors_base.xml index 3b85efa77..39f897639 100644 --- a/indra/newview/skins/openlife/textures/colors_base.xml +++ b/indra/newview/skins/openlife/textures/colors_base.xml @@ -171,6 +171,7 @@ + diff --git a/indra/newview/skins/pslgreen/colors_base.xml b/indra/newview/skins/pslgreen/colors_base.xml index 3708d8d0b..10647478b 100644 --- a/indra/newview/skins/pslgreen/colors_base.xml +++ b/indra/newview/skins/pslgreen/colors_base.xml @@ -181,6 +181,7 @@ + diff --git a/indra/newview/skins/pslpurple/colors_base.xml b/indra/newview/skins/pslpurple/colors_base.xml index 3708d8d0b..10647478b 100644 --- a/indra/newview/skins/pslpurple/colors_base.xml +++ b/indra/newview/skins/pslpurple/colors_base.xml @@ -181,6 +181,7 @@ + diff --git a/indra/newview/skins/ruby/colors_base.xml b/indra/newview/skins/ruby/colors_base.xml index 1817e9ea6..f55f4c2e5 100644 --- a/indra/newview/skins/ruby/colors_base.xml +++ b/indra/newview/skins/ruby/colors_base.xml @@ -181,6 +181,7 @@ + diff --git a/indra/newview/skins/sapphire/colors_base.xml b/indra/newview/skins/sapphire/colors_base.xml index 42f4435a3..0b5e343e1 100644 --- a/indra/newview/skins/sapphire/colors_base.xml +++ b/indra/newview/skins/sapphire/colors_base.xml @@ -187,6 +187,7 @@ + diff --git a/indra/newview/skins/silver/colors_base.xml b/indra/newview/skins/silver/colors_base.xml index 15aebd29b..7ae59a490 100644 --- a/indra/newview/skins/silver/colors_base.xml +++ b/indra/newview/skins/silver/colors_base.xml @@ -193,6 +193,7 @@ + diff --git a/indra/newview/skins/white_emerald/colors_base.xml b/indra/newview/skins/white_emerald/colors_base.xml index 514782ebb..b637519e0 100644 --- a/indra/newview/skins/white_emerald/colors_base.xml +++ b/indra/newview/skins/white_emerald/colors_base.xml @@ -182,6 +182,7 @@ + diff --git a/indra/newview/skins/wisdom/colors_base.xml b/indra/newview/skins/wisdom/colors_base.xml index 0174b95b8..cfb056c21 100644 --- a/indra/newview/skins/wisdom/colors_base.xml +++ b/indra/newview/skins/wisdom/colors_base.xml @@ -186,6 +186,7 @@ +