diff options
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llfloaterabout.cpp | 10 | ||||
-rw-r--r-- | linden/indra/newview/lloverlaybar.cpp | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index 4953410..aeca4b5 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp | |||
@@ -42,6 +42,7 @@ | |||
42 | #include "llcurl.h" | 42 | #include "llcurl.h" |
43 | #include "llimagej2c.h" | 43 | #include "llimagej2c.h" |
44 | #include "audioengine.h" | 44 | #include "audioengine.h" |
45 | #include "llmediaimplgstreamer.h" | ||
45 | 46 | ||
46 | #include "llviewertexteditor.h" | 47 | #include "llviewertexteditor.h" |
47 | #include "llviewercontrol.h" | 48 | #include "llviewercontrol.h" |
@@ -208,6 +209,15 @@ LLFloaterAbout::LLFloaterAbout() | |||
208 | LLMediaManager *mgr = LLMediaManager::getInstance(); | 209 | LLMediaManager *mgr = LLMediaManager::getInstance(); |
209 | if (mgr) | 210 | if (mgr) |
210 | { | 211 | { |
212 | LLMediaBase *gstreamer = new LLMediaImplGStreamer(); | ||
213 | if (gstreamer) | ||
214 | { | ||
215 | support.append("GStreamer Version: "); | ||
216 | support.append( gstreamer->getVersion() ); | ||
217 | support.append("\n"); | ||
218 | } | ||
219 | delete gstreamer; | ||
220 | |||
211 | LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html"); | 221 | LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html"); |
212 | if (media_source) | 222 | if (media_source) |
213 | { | 223 | { |
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp index 80cac14..a4eedbb 100644 --- a/linden/indra/newview/lloverlaybar.cpp +++ b/linden/indra/newview/lloverlaybar.cpp | |||
@@ -391,14 +391,6 @@ void LLOverlayBar::toggleMusicPlay(void*) | |||
391 | } | 391 | } |
392 | } | 392 | } |
393 | } | 393 | } |
394 | //else | ||
395 | //{ | ||
396 | // gOverlayBar->mMusicState = PAUSED; // desired state | ||
397 | // if (gAudiop) | ||
398 | // { | ||
399 | // gAudiop->pauseInternetStream(1); | ||
400 | // } | ||
401 | //} | ||
402 | else | 394 | else |
403 | { | 395 | { |
404 | gOverlayBar->mMusicState = STOPPED; // desired state | 396 | gOverlayBar->mMusicState = STOPPED; // desired state |