diff options
Diffstat (limited to 'linden/indra/newview/llviewercontrol.cpp')
-rw-r--r-- | linden/indra/newview/llviewercontrol.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp index 3675072..00e3a9a 100644 --- a/linden/indra/newview/llviewercontrol.cpp +++ b/linden/indra/newview/llviewercontrol.cpp | |||
@@ -38,7 +38,8 @@ | |||
38 | #include "indra_constants.h" | 38 | #include "indra_constants.h" |
39 | 39 | ||
40 | // For Listeners | 40 | // For Listeners |
41 | #include "llaudioengine.h" | 41 | // #include "llaudioengine.h" |
42 | #include "kokuastreamingaudio.h" | ||
42 | #include "llagent.h" | 43 | #include "llagent.h" |
43 | #include "llconsole.h" | 44 | #include "llconsole.h" |
44 | #include "lldrawpoolterrain.h" | 45 | #include "lldrawpoolterrain.h" |
@@ -310,7 +311,7 @@ static bool handleJoystickChanged(const LLSD& newvalue) | |||
310 | 311 | ||
311 | static bool handleAudioStreamMusicChanged(const LLSD& newvalue) | 312 | static bool handleAudioStreamMusicChanged(const LLSD& newvalue) |
312 | { | 313 | { |
313 | if (gAudiop) | 314 | if (gAudioStream) |
314 | { | 315 | { |
315 | if ( newvalue.asBoolean() ) | 316 | if ( newvalue.asBoolean() ) |
316 | { | 317 | { |
@@ -319,15 +320,15 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue) | |||
319 | { | 320 | { |
320 | // if stream is already playing, don't call this | 321 | // if stream is already playing, don't call this |
321 | // otherwise music will briefly stop | 322 | // otherwise music will briefly stop |
322 | if ( !gAudiop->isInternetStreamPlaying() ) | 323 | if ( !gAudioStream->isInternetStreamPlaying() ) |
323 | { | 324 | { |
324 | gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL()); | 325 | gAudioStream->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL()); |
325 | } | 326 | } |
326 | } | 327 | } |
327 | } | 328 | } |
328 | else | 329 | else |
329 | { | 330 | { |
330 | gAudiop->stopInternetStream(); | 331 | gAudioStream->stopInternetStream(); |
331 | } | 332 | } |
332 | } | 333 | } |
333 | return true; | 334 | return true; |