move streaming audio out of gAudiop into its own class.

* might solve several issues with streaming audio, like:
  streaming audio not working when the sound effects driver fails.
* breaks fmod. Sorry. If you want fmod go fix it, its probably not difficult.

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 @@
 #include "indra_constants.h"
 
 // For Listeners
-#include "llaudioengine.h"
+// #include "llaudioengine.h"
+#include "kokuastreamingaudio.h"
 #include "llagent.h"
 #include "llconsole.h"
 #include "lldrawpoolterrain.h"
@@ -310,7 +311,7 @@ static bool handleJoystickChanged(const LLSD& newvalue)
 
 static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
 {
-        if (gAudiop)
+        if (gAudioStream)
         {
                 if ( newvalue.asBoolean() )
                 {
@@ -319,15 +320,15 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
                         {
                                 // if stream is already playing, don't call this
                                 // otherwise music will briefly stop
-                                if ( !gAudiop->isInternetStreamPlaying() )
+                                if ( !gAudioStream->isInternetStreamPlaying() )
                                 {
-                                        gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL());
+                                        gAudioStream->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL());
                                 }
                         }
                 }
                 else
                 {
-                        gAudiop->stopInternetStream();
+                        gAudioStream->stopInternetStream();
                 }
         }
         return true;