aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmediaremotectrl.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-03-09 22:45:57 -0700
committerMcCabe Maxsted2011-03-09 22:45:57 -0700
commit37076c285bceb4546bd3e7b6fa1b175008508368 (patch)
tree36ac51e0ac31d5ca1c9096235643833d967d9ea3 /linden/indra/newview/llmediaremotectrl.cpp
parentFixed being unable to change streaming audio volume on Windows (diff)
downloadmeta-impy-37076c285bceb4546bd3e7b6fa1b175008508368.zip
meta-impy-37076c285bceb4546bd3e7b6fa1b175008508368.tar.gz
meta-impy-37076c285bceb4546bd3e7b6fa1b175008508368.tar.bz2
meta-impy-37076c285bceb4546bd3e7b6fa1b175008508368.tar.xz
Fixed play button disappearing when you play streaming audio
Diffstat (limited to 'linden/indra/newview/llmediaremotectrl.cpp')
-rw-r--r--linden/indra/newview/llmediaremotectrl.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 27a686d..8186293 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -153,7 +153,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
153 bool stop_media_enabled = false; 153 bool stop_media_enabled = false;
154 bool play_music_enabled = false; 154 bool play_music_enabled = false;
155 bool stop_music_enabled = false; 155 bool stop_music_enabled = false;
156 bool music_show_pause = false; 156 //bool music_show_pause = false;
157 bool media_show_pause = false; 157 bool media_show_pause = false;
158 158
159 static LLColor4* sIconDisabledColor = rebind_llcontrol<LLColor4>("IconDisabledColor", &gColors, true); 159 static LLColor4* sIconDisabledColor = rebind_llcontrol<LLColor4>("IconDisabledColor", &gColors, true);
@@ -213,12 +213,12 @@ void LLMediaRemoteCtrl::enableMediaButtons()
213 213
214 if (gOverlayBar->musicPlaying()) 214 if (gOverlayBar->musicPlaying())
215 { 215 {
216 music_show_pause = true; 216 play_music_enabled = false;
217 stop_music_enabled = true; 217 stop_music_enabled = true;
218 } 218 }
219 else 219 else
220 { 220 {
221 music_show_pause = false; 221 play_music_enabled = true;
222 stop_music_enabled = false; 222 stop_music_enabled = false;
223 } 223 }
224 } 224 }
@@ -227,7 +227,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
227 const std::string media_icon_name = LLMIMETypes::findIcon(media_type); 227 const std::string media_icon_name = LLMIMETypes::findIcon(media_type);
228 LLButton* music_play_btn = getChild<LLButton>("music_play"); 228 LLButton* music_play_btn = getChild<LLButton>("music_play");
229 LLButton* music_stop_btn = getChild<LLButton>("music_stop"); 229 LLButton* music_stop_btn = getChild<LLButton>("music_stop");
230 LLButton* music_pause_btn = getChild<LLButton>("music_pause"); 230 //LLButton* music_pause_btn = getChild<LLButton>("music_pause");
231 LLButton* media_play_btn = getChild<LLButton>("media_play"); 231 LLButton* media_play_btn = getChild<LLButton>("media_play");
232 LLButton* media_stop_btn = getChild<LLButton>("media_stop"); 232 LLButton* media_stop_btn = getChild<LLButton>("media_stop");
233 LLButton* media_pause_btn = getChild<LLButton>("media_pause"); 233 LLButton* media_pause_btn = getChild<LLButton>("media_pause");
@@ -235,9 +235,9 @@ void LLMediaRemoteCtrl::enableMediaButtons()
235 235
236 music_play_btn->setEnabled(play_music_enabled); 236 music_play_btn->setEnabled(play_music_enabled);
237 music_stop_btn->setEnabled(stop_music_enabled); 237 music_stop_btn->setEnabled(stop_music_enabled);
238 music_pause_btn->setEnabled(music_show_pause); 238 //music_pause_btn->setEnabled(music_show_pause);
239 music_pause_btn->setVisible(music_show_pause); 239 //music_pause_btn->setVisible(music_show_pause);
240 music_play_btn->setVisible(! music_show_pause); 240 //music_play_btn->setVisible(music_show_pause);
241 childSetColor("music_icon", music_icon_color); 241 childSetColor("music_icon", music_icon_color);
242 if(!media_icon_name.empty()) 242 if(!media_icon_name.empty())
243 { 243 {