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.

3 files changed, 3 insertions, 100 deletions

diff --git a/linden/indra/llaudio/llaudioengine.cpp b/linden/indra/llaudio/llaudioengine.cpp
index bed791a..6b0003a 100644
--- a/linden/indra/llaudio/llaudioengine.cpp
+++ b/linden/indra/llaudio/llaudioengine.cpp
@@ -36,7 +36,6 @@
 #include "linden_common.h"
 
 #include "llaudioengine.h"
-#include "llstreamingaudio.h"
 
 #include "llerror.h"
 #include "llmath.h"
@@ -48,7 +47,6 @@
 #include "llaudiodecodemgr.h"
 #include "llassetstorage.h"
 
-
 // necessary for grabbing sounds from sim (implemented in viewer)       
 extern void request_sound(const LLUUID &sound_guid);
 
@@ -70,16 +68,6 @@ LLAudioEngine::~LLAudioEngine()
 {
 }
 
-LLStreamingAudioInterface* LLAudioEngine::getStreamingAudioImpl()
-{
-        return mStreamingAudioImpl;
-}
-
-void LLAudioEngine::setStreamingAudioImpl(LLStreamingAudioInterface *impl)
-{
-        mStreamingAudioImpl = impl;
-}
-
 void LLAudioEngine::setDefaults()
 {
         mMaxWindGain = 1.f;
@@ -108,8 +96,6 @@ void LLAudioEngine::setDefaults()
         mInternalGain = 0.f;
         mNextWindUpdate = 0.f;
 
-        mStreamingAudioImpl = NULL;
-
         for (U32 i = 0; i < LLAudioEngine::AUDIO_TYPE_COUNT; i++)
                 mSecondaryGain[i] = 1.0f;
 }
@@ -174,62 +160,6 @@ void LLAudioEngine::shutdown()
         }
 }
 
-
-// virtual
-void LLAudioEngine::startInternetStream(const std::string& url)
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->start(url);
-}
-
-
-// virtual
-void LLAudioEngine::stopInternetStream()
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->stop();
-}
-
-// virtual
-void LLAudioEngine::pauseInternetStream(int pause)
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->pause(pause);
-}
-
-// virtual
-void LLAudioEngine::updateInternetStream()
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->update();
-}
-
-// virtual
-int LLAudioEngine::isInternetStreamPlaying()
-{
-        if (mStreamingAudioImpl)
-                return mStreamingAudioImpl->isPlaying();
-
-        return 0; // Stopped
-}
-
-
-// virtual
-void LLAudioEngine::setInternetStreamGain(F32 vol)
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->setGain(vol);
-}
-
-// virtual
-std::string LLAudioEngine::getInternetStreamURL()
-{
-        if (mStreamingAudioImpl)
-                return mStreamingAudioImpl->getURL();
-        else return std::string();
-}
-
-
 void LLAudioEngine::updateChannels()
 {
         S32 i;
@@ -512,7 +442,6 @@ void LLAudioEngine::idle(F32 max_decode_time)
         // or request new data.
         startNextTransfer();
 
-        updateInternetStream();
 }
 
 
@@ -754,14 +683,6 @@ F32 LLAudioEngine::getSecondaryGain(S32 type)
         return mSecondaryGain[type];
 }
 
-F32 LLAudioEngine::getInternetStreamGain()
-{
-        if (mStreamingAudioImpl)
-                return mStreamingAudioImpl->getGain();
-        else
-                return 1.0f;
-}
-
 void LLAudioEngine::setMaxWindGain(F32 gain)
 {
         mMaxWindGain = gain;
diff --git a/linden/indra/llaudio/llaudioengine.h b/linden/indra/llaudio/llaudioengine.h
index a1b240e..7237ce2 100644
--- a/linden/indra/llaudio/llaudioengine.h
+++ b/linden/indra/llaudio/llaudioengine.h
@@ -71,8 +71,6 @@ class LLAudioData;
 class LLAudioChannel;
 class LLAudioChannelOpenAL;
 class LLAudioBuffer;
-class LLStreamingAudioInterface;
-
 
 //
 //  LLAudioEngine definition
@@ -119,16 +117,13 @@ public:
         // stops playing new sounds.
         void setMuted(bool muted);
         bool getMuted() const { return mMuted; }
-#ifdef USE_PLUGIN_MEDIA
-        LLPluginClassMedia* initializeMedia(const std::string& media_type);
-#endif
+
         F32 getMasterGain();
         void setMasterGain(F32 gain);
 
         F32 getSecondaryGain(S32 type);
         void setSecondaryGain(S32 type, F32 gain);
 
-        F32 getInternetStreamGain();
 
         virtual void setDopplerFactor(F32 factor);
         virtual F32 getDopplerFactor();
@@ -150,19 +145,6 @@ public:
         LLAudioSource *findAudioSource(const LLUUID &source_id);
         LLAudioData *getAudioData(const LLUUID &audio_uuid);
 
-        // Internet stream implementation manipulation
-        LLStreamingAudioInterface *getStreamingAudioImpl();
-        void setStreamingAudioImpl(LLStreamingAudioInterface *impl);
-        // Internet stream methods - these will call down into the *mStreamingAudioImpl if it exists
-        void startInternetStream(const std::string& url);
-        void stopInternetStream();
-        void pauseInternetStream(int pause);
-        void updateInternetStream(); // expected to be called often
-        int isInternetStreamPlaying();
-        // use a value from 0.0 to 1.0, inclusive
-        void setInternetStreamGain(F32 vol);
-        std::string getInternetStreamURL();
-        
         // For debugging usage
         virtual LLVector3 getListenerPos();
 
@@ -247,7 +229,6 @@ protected:
 
 private:
         void setDefaults();
-        LLStreamingAudioInterface *mStreamingAudioImpl;
 };
 
 
diff --git a/linden/indra/llaudio/llstreamingaudio.h b/linden/indra/llaudio/llstreamingaudio.h
index aa89e6a..f5d5334 100644
--- a/linden/indra/llaudio/llstreamingaudio.h
+++ b/linden/indra/llaudio/llstreamingaudio.h
@@ -36,7 +36,7 @@
 
 #include "stdtypes.h" // from llcommon
 
-// Entirely abstract.  Based exactly on the historic API.
+// Entirely abstract.  Based on the historic API.
 class LLStreamingAudioInterface
 {
  public:
@@ -51,6 +51,7 @@ class LLStreamingAudioInterface
         virtual void setGain(F32 vol) = 0;
         virtual F32 getGain() = 0;
         virtual std::string getURL() = 0;
+        virtual std::string getVersion() = 0;
 };
 
 #endif // LL_STREAMINGAUDIO_H