From b4959214023db77c6048036cc924075c4271ba74 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 4 Jan 2011 00:25:35 +0100
Subject: 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.
---
 linden/indra/llaudio/llaudioengine.cpp | 79 ----------------------------------
 1 file changed, 79 deletions(-)

(limited to 'linden/indra/llaudio/llaudioengine.cpp')

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;
-- 
cgit v1.1