diff options
author | Jacek Antonelli | 2009-04-02 01:05:17 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-02 03:27:26 -0500 |
commit | c9ba230c987e27b1cabc208f0dd21cc6cf09e553 (patch) | |
tree | a0f97e233d00d32d0a532d953d102760877a6631 /linden/indra/newview | |
parent | Added MediaDebugLevel setting in XML (does nothing yet). (diff) | |
download | meta-impy-c9ba230c987e27b1cabc208f0dd21cc6cf09e553.zip meta-impy-c9ba230c987e27b1cabc208f0dd21cc6cf09e553.tar.gz meta-impy-c9ba230c987e27b1cabc208f0dd21cc6cf09e553.tar.bz2 meta-impy-c9ba230c987e27b1cabc208f0dd21cc6cf09e553.tar.xz |
Implemented handleMediaDebugLevelChanged hook.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llviewercontrol.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp index 7a30b22..a8a3b16 100644 --- a/linden/indra/newview/llviewercontrol.cpp +++ b/linden/indra/newview/llviewercontrol.cpp | |||
@@ -70,6 +70,7 @@ | |||
70 | #include "llvosurfacepatch.h" | 70 | #include "llvosurfacepatch.h" |
71 | #include "llvowlsky.h" | 71 | #include "llvowlsky.h" |
72 | #include "llrender.h" | 72 | #include "llrender.h" |
73 | #include "llmediamanager.h" | ||
73 | 74 | ||
74 | #ifdef TOGGLE_HACKED_GODLIKE_VIEWER | 75 | #ifdef TOGGLE_HACKED_GODLIKE_VIEWER |
75 | BOOL gHackGodmode = FALSE; | 76 | BOOL gHackGodmode = FALSE; |
@@ -429,6 +430,22 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue) | |||
429 | return true; | 430 | return true; |
430 | } | 431 | } |
431 | 432 | ||
433 | bool handleMediaDebugLevelChanged(const LLSD& newvalue) | ||
434 | { | ||
435 | LLMediaManager *mgr = LLMediaManager::getInstance(); | ||
436 | if (mgr) | ||
437 | { | ||
438 | LLMediaBase *impl = | ||
439 | mgr->createSourceFromMimeType("http", "audio/mpeg"); | ||
440 | |||
441 | if (impl) | ||
442 | { | ||
443 | impl->setDebugLevel( (LLMediaBase::EDebugLevel)newvalue.asInteger() ); | ||
444 | } | ||
445 | } | ||
446 | return true; | ||
447 | } | ||
448 | |||
432 | //////////////////////////////////////////////////////////////////////////// | 449 | //////////////////////////////////////////////////////////////////////////// |
433 | 450 | ||
434 | void settings_setup_listeners() | 451 | void settings_setup_listeners() |
@@ -556,6 +573,7 @@ void settings_setup_listeners() | |||
556 | gSavedSettings.getControl("VoiceInputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); | 573 | gSavedSettings.getControl("VoiceInputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); |
557 | gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); | 574 | gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); |
558 | gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); | 575 | gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1)); |
576 | gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1)); | ||
559 | } | 577 | } |
560 | 578 | ||
561 | template <> eControlType get_control_type<U32>(const U32& in, LLSD& out) | 579 | template <> eControlType get_control_type<U32>(const U32& in, LLSD& out) |