1 files changed, 17 insertions, 344 deletions

diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/llaudioengine_fmod.cpp
index 938c2aa..85ae863 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/llaudioengine_fmod.cpp
@@ -32,8 +32,11 @@
 
 #include "linden_common.h"
 
-#include "audioengine_fmod.h"
-#include "listener_fmod.h"
+#include "llstreamingaudio.h"
+#include "llstreamingaudio_fmod.h"
+
+#include "llaudioengine_fmod.h"
+#include "lllistener_fmod.h"
 
 #include "llerror.h"
 #include "llmath.h"
@@ -46,6 +49,7 @@
 
 #include "sound_ids.h"
 
+
 extern "C" {
         void * F_CALLBACKAPI windCallback(void *originalbuffer, void *newbuffer, int length, void* userdata);
 }
@@ -53,35 +57,9 @@ extern "C" {
 FSOUND_DSPUNIT *gWindDSP = NULL;
 
 
-// Safe strcpy
-#if 0 //(unused)  //LL_WINDOWS || LL_LINUX
-static size_t strlcpy( char* dest, const char* src, size_t dst_size )
-{
-        size_t source_len = 0;
-        size_t min_len = 0;
-        if( dst_size > 0 )
-        {
-                if( src )
-                {
-                        source_len = strlen(src);       /*Flawfinder: ignore*/
-                        min_len = llmin( dst_size - 1, source_len );
-                        memcpy(dest, src, min_len);     /*Flawfinder: ignore*/  
-                }
-                dest[min_len] = '\0';
-        }
-        return source_len;
-}
-#else
-// apple ships with the non-standard strlcpy in /usr/include/string.h:
-// size_t strlcpy(char *, const char *, size_t);
-#endif
-
-
 LLAudioEngine_FMOD::LLAudioEngine_FMOD()
 {
         mInited = false;
-        mCurrentInternetStreamp = NULL;
-        mInternetStreamChannel = -1;
         mWindGen = NULL;
 }
 
@@ -93,8 +71,6 @@ LLAudioEngine_FMOD::~LLAudioEngine_FMOD()
 
 bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
 {
-        mFadeIn = -10000;
-
         LLAudioEngine::init(num_channels, userdata);
 
         // Reserve one extra channel for the http stream.
@@ -241,7 +217,9 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
         
 #endif
 
-        initInternetStream();
+        // set up our favourite FMOD-native streaming audio implementation if none has already been added
+        if (!getStreamingAudioImpl()) // no existing implementation added
+                setStreamingAudioImpl(new LLStreamingAudio_FMOD());
 
         LL_DEBUGS("AppInit") << "LLAudioEngine_FMOD::init() FMOD initialized correctly" << LL_ENDL;
 
@@ -296,13 +274,13 @@ void LLAudioEngine_FMOD::shutdown()
 }
 
 
-LLAudioBuffer *LLAudioEngine_FMOD::createBuffer()
+LLAudioBuffer * LLAudioEngine_FMOD::createBuffer()
 {
         return new LLAudioBufferFMOD();
 }
 
 
-LLAudioChannel *LLAudioEngine_FMOD::createChannel()
+LLAudioChannel * LLAudioEngine_FMOD::createChannel()
 {
         return new LLAudioChannelFMOD();
 }
@@ -432,10 +410,12 @@ void LLAudioEngine_FMOD::setInternalGain(F32 gain)
         gain = llclamp( gain, 0.0f, 1.0f );
         FSOUND_SetSFXMasterVolume( llround( 255.0f * gain ) );
 
-        if ( mInternetStreamChannel != -1 )
+        LLStreamingAudioInterface *saimpl = getStreamingAudioImpl();
+        if ( saimpl )
         {
-                F32 clamp_internet_stream_gain = llclamp( mInternetStreamGain, 0.0f, 1.0f );
-                FSOUND_SetVolumeAbsolute( mInternetStreamChannel, llround( 255.0f * clamp_internet_stream_gain ) );
+                // fmod likes its streaming audio channel gain re-asserted after
+                // master volume change.
+                saimpl->setGain(saimpl->getGain());
         }
 }
 
@@ -660,7 +640,7 @@ bool LLAudioBufferFMOD::loadWAV(const std::string& filename)
                 return false;
         }
 
-        if (!LLAPRFile::isExist(filename, NULL, LL_APR_RPB))
+        if (!LLAPRFile::isExist(filename, LL_APR_RPB))
         {
                 // File not found, abort.
                 return false;
@@ -752,313 +732,6 @@ void LLAudioBufferFMOD::set3DMode(bool use3d)
 }
 
 
-
-//---------------------------------------------------------------------------
-// Internet Streaming
-//---------------------------------------------------------------------------
-void LLAudioEngine_FMOD::initInternetStream()
-{
-        // Number of milliseconds of audio to buffer for the audio card.
-        // Must be larger than the usual Second Life frame stutter time.
-        FSOUND_Stream_SetBufferSize(200);
-
-        // Here's where we set the size of the network buffer and some buffering 
-        // parameters.  In this case we want a network buffer of 16k, we want it 
-        // to prebuffer 40% of that when we first connect, and we want it 
-        // to rebuffer 80% of that whenever we encounter a buffer underrun.
-
-        // Leave the net buffer properties at the default.
-        //FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80);
-        mInternetStreamURL.clear();
-}
-
-
-void LLAudioEngine_FMOD::startInternetStream(const std::string& url)
-{
-        if (!mInited)
-        {
-                llwarns << "startInternetStream before audio initialized" << llendl;
-                return;
-        }
-
-        // "stop" stream but don't clear url, etc. in calse url == mInternetStreamURL
-        stopInternetStream();
-        if (!url.empty())
-        {
-                llinfos << "Starting internet stream: " << url << llendl;
-                mCurrentInternetStreamp = new LLAudioStreamFMOD(url);
-                mInternetStreamURL = url;
-        }
-        else
-        {
-                llinfos << "Set internet stream to null" << llendl;
-                mInternetStreamURL.clear();
-        }
-}
-
-
-signed char F_CALLBACKAPI LLAudioEngine_FMOD::callbackMetaData(char *name, char *value, void *userdata)
-{
-        /*
-        LLAudioEngine_FMOD* self = (LLAudioEngine_FMOD*)userdata;
-
-    if (!strcmp("ARTIST", name))
-    {
-        strlcpy(self->mInternetStreamArtist, value, 256);
-        self->mInternetStreamNewMetaData = true;
-        return true;
-    }
-
-    if (!strcmp("TITLE", name))
-    {
-        strlcpy(self->mInternetStreamTitle, value, 256);
-        self->mInternetStreamNewMetaData = true;
-        return true;
-    }
-        */
-
-    return true;
-}
-
-
-void LLAudioEngine_FMOD::updateInternetStream()
-{
-        // Kill dead internet streams, if possible
-        std::list<LLAudioStreamFMOD *>::iterator iter;
-        for (iter = mDeadStreams.begin(); iter != mDeadStreams.end();)
-        {
-                LLAudioStreamFMOD *streamp = *iter;
-                if (streamp->stopStream())
-                {
-                        llinfos << "Closed dead stream" << llendl;
-                        delete streamp;
-                        mDeadStreams.erase(iter++);
-                }
-                else
-                {
-                        iter++;
-                }
-        }
-
-        // Don't do anything if there are no streams playing
-        if (!mCurrentInternetStreamp)
-        {
-                return;
-        }
-
-    int open_state = mCurrentInternetStreamp->getOpenState();
-
-        if (!open_state)
-        {
-                // Stream is live
-
-
-                // start the stream if it's ready
-                if (mInternetStreamChannel < 0)
-                {
-                        mInternetStreamChannel = mCurrentInternetStreamp->startStream();
-
-                        if (mInternetStreamChannel != -1)
-                        {
-                                // Reset volume to previously set volume
-                                setInternetStreamGain(mInternetStreamGain);
-                                FSOUND_SetPaused(mInternetStreamChannel, false);
-                                //FSOUND_Stream_Net_SetMetadataCallback(mInternetStream, callbackMetaData, this);
-                        }
-                }
-        }
-                
-        switch(open_state)
-        {
-        default:
-        case 0:
-                // success
-                break;
-        case -1:
-                // stream handle is invalid
-                llwarns << "InternetStream - invalid handle" << llendl;
-                stopInternetStream();
-                return;
-        case -2:
-                // opening
-                //strlcpy(mInternetStreamArtist, "Opening", 256);
-                break;
-        case -3:
-                // failed to open, file not found, perhaps
-                llwarns << "InternetSteam - failed to open" << llendl;
-                stopInternetStream();
-                return;
-        case -4:
-                // connecting
-                //strlcpy(mInternetStreamArtist, "Connecting", 256);
-                break;
-        case -5:
-                // buffering
-                //strlcpy(mInternetStreamArtist, "Buffering", 256);
-                break;
-        }
-
-}
-
-void LLAudioEngine_FMOD::stopInternetStream()
-{
-        if (mInternetStreamChannel != -1)
-        {
-                FSOUND_SetPaused(mInternetStreamChannel, true);
-                FSOUND_SetPriority(mInternetStreamChannel, 0);
-                mInternetStreamChannel = -1;
-        }
-
-        if (mCurrentInternetStreamp)
-        {
-                llinfos << "Stopping internet stream: " << mCurrentInternetStreamp->getURL() << llendl;
-                if (mCurrentInternetStreamp->stopStream())
-                {
-                        delete mCurrentInternetStreamp;
-                }
-                else
-                {
-                        llwarns << "Pushing stream to dead list: " << mCurrentInternetStreamp->getURL() << llendl;
-                        mDeadStreams.push_back(mCurrentInternetStreamp);
-                }
-                mCurrentInternetStreamp = NULL;
-                //mInternetStreamURL.clear();
-        }
-}
-
-void LLAudioEngine_FMOD::pauseInternetStream(int pause)
-{
-        if (pause < 0)
-        {
-                pause = mCurrentInternetStreamp ? 1 : 0;
-        }
-
-        if (pause)
-        {
-                if (mCurrentInternetStreamp)
-                {
-                        stopInternetStream();
-                }
-        }
-        else
-        {
-                startInternetStream(mInternetStreamURL);
-        }
-}
-
-
-// A stream is "playing" if it has been requested to start.  That
-// doesn't necessarily mean audio is coming out of the speakers.
-int LLAudioEngine_FMOD::isInternetStreamPlaying()
-{
-        if (mCurrentInternetStreamp)
-        {
-                return 1; // Active and playing
-        }
-        else if (!mInternetStreamURL.empty())
-        {
-                return 2; // "Paused"
-        }
-        else
-        {
-                return 0;
-        }
-}
-
-
-void LLAudioEngine_FMOD::setInternetStreamGain(F32 vol)
-{
-        mInternetStreamGain = vol;
-
-        if (mInternetStreamChannel != -1)
-        {
-                vol = llclamp(vol, 0.f, 1.f);
-                int vol_int = llround(vol * 255.f);
-                FSOUND_SetVolumeAbsolute(mInternetStreamChannel, vol_int);
-        }
-}
-
-
-LLAudioStreamFMOD::LLAudioStreamFMOD(const std::string& url) :
-        mInternetStream(NULL),
-        mReady(false)
-{
-        mInternetStreamURL = url;
-        mInternetStream = FSOUND_Stream_Open(url.c_str(), FSOUND_NORMAL | FSOUND_NONBLOCKING, 0, 0);
-        if (!mInternetStream)
-        {
-                llwarns << "Couldn't open fmod stream, error "
-                        << FMOD_ErrorString(FSOUND_GetError())
-                        << llendl;
-                mReady = false;
-                return;
-        }
-
-        mReady = true;
-}
-
-int LLAudioStreamFMOD::startStream()
-{
-        // We need a live and opened stream before we try and play it.
-        if (!mInternetStream || getOpenState())
-        {
-                llwarns << "No internet stream to start playing!" << llendl;
-                return -1;
-        }
-
-        // Make sure the stream is set to 2D mode.
-        FSOUND_Stream_SetMode(mInternetStream, FSOUND_2D);
-
-        return FSOUND_Stream_PlayEx(FSOUND_FREE, mInternetStream, NULL, true);
-}
-
-bool LLAudioStreamFMOD::stopStream()
-{
-        if (mInternetStream)
-        {
-                int read_percent = 0;
-                int status = 0;
-                int bitrate = 0;
-                unsigned int flags = 0x0;
-                FSOUND_Stream_Net_GetStatus(mInternetStream, &status, &read_percent, &bitrate, &flags);
-
-                bool close = true;
-                switch (status)
-                {
-                case FSOUND_STREAM_NET_CONNECTING:
-                        close = false;
-                        break;
-                case FSOUND_STREAM_NET_NOTCONNECTED:
-                case FSOUND_STREAM_NET_BUFFERING:
-                case FSOUND_STREAM_NET_READY:
-                case FSOUND_STREAM_NET_ERROR:
-                default:
-                        close = true;
-                }
-
-                if (close)
-                {
-                        FSOUND_Stream_Close(mInternetStream);
-                        mInternetStream = NULL;
-                        return true;
-                }
-                else
-                {
-                        return false;
-                }
-        }
-        else
-        {
-                return true;
-        }
-}
-
-int LLAudioStreamFMOD::getOpenState()
-{
-        int open_state = FSOUND_Stream_GetOpenState(mInternetStream);
-        return open_state;
-}
-
 void * F_CALLBACKAPI windCallback(void *originalbuffer, void *newbuffer, int length, void* userdata)
 {
         // originalbuffer = fmod's original mixbuffer.