summaryrefslogtreecommitdiff
path: root/indra/llaudio/llstreamingaudio_fmodex.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-05 14:26:27 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-05 14:26:27 -0700
commitc38204f5e0a9130f0d4d4bfc997da107fd1017ce (patch)
treea00e997bdf63a6c43590366f1f8e6fe850cb01cf /indra/llaudio/llstreamingaudio_fmodex.cpp
parentd40acfb05a475c0e59bccacdde259fe53ecdb203 (diff)
Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat
Diffstat (limited to 'indra/llaudio/llstreamingaudio_fmodex.cpp')
-rw-r--r--indra/llaudio/llstreamingaudio_fmodex.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index 96b739fa13..42f30aa1c4 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -100,13 +100,13 @@ void LLStreamingAudio_FMODEX::start(const std::string& url)
if (!url.empty())
{
- //LL_DEBUGS("FMODEX") << "Starting internet stream: " << url << llendl;
+ llinfos << "Starting internet stream: " << url << llendl;
mCurrentInternetStreamp = new LLAudioStreamManagerFMODEX(mSystem,url);
mURL = url;
}
else
{
- //LL_DEBUGS("FMODEX") << "Set internet stream to null" << llendl;
+ llinfos << "Set internet stream to null" << llendl;
mURL.clear();
}
}
@@ -121,7 +121,7 @@ void LLStreamingAudio_FMODEX::update()
LLAudioStreamManagerFMODEX *streamp = *iter;
if (streamp->stopStream())
{
- //LL_DEBUGS("FMODEX") << "Closed dead stream" << llendl;
+ llinfos << "Closed dead stream" << llendl;
delete streamp;
mDeadStreams.erase(iter++);
}
@@ -181,7 +181,7 @@ void LLStreamingAudio_FMODEX::update()
{
if (!strcmp(tag.name, "Sample Rate Change"))
{
- //LL_DEBUGS("FMODEX") << "Stream forced changing sample rate to " << *((float *)tag.data) << llendl;
+ llinfos << "Stream forced changing sample rate to " << *((float *)tag.data) << llendl;
mFMODInternetStreamChannelp->setFrequency(*((float *)tag.data));
}
continue;
@@ -195,9 +195,9 @@ void LLStreamingAudio_FMODEX::update()
mFMODInternetStreamChannelp->getPaused(&paused);
if(!paused)
{
- //LL_DEBUGS("FMODEX") << "Stream starvation detected! Pausing stream until buffer nearly full." << llendl;
- //LL_DEBUGS("FMODEX") << " (diskbusy="<<diskbusy<<")" << llendl;
- //LL_DEBUGS("FMODEX") << " (progress="<<progress<<")" << llendl;
+ llinfos << "Stream starvation detected! Pausing stream until buffer nearly full." << llendl;
+ llinfos << " (diskbusy="<<diskbusy<<")" << llendl;
+ llinfos << " (progress="<<progress<<")" << llendl;
mFMODInternetStreamChannelp->setPaused(true);
}
}
@@ -220,14 +220,14 @@ void LLStreamingAudio_FMODEX::stop()
if (mCurrentInternetStreamp)
{
- //LL_DEBUGS("FMODEX") << "Stopping internet stream: " << mCurrentInternetStreamp->getURL() << llendl;
+ llinfos << "Stopping internet stream: " << mCurrentInternetStreamp->getURL() << llendl;
if (mCurrentInternetStreamp->stopStream())
{
delete mCurrentInternetStreamp;
}
else
{
- //LL_DEBUGS("FMODEX") << "Pushing stream to dead list: " << mCurrentInternetStreamp->getURL() << llendl;
+ llwarns << "Pushing stream to dead list: " << mCurrentInternetStreamp->getURL() << llendl;
mDeadStreams.push_back(mCurrentInternetStreamp);
}
mCurrentInternetStreamp = NULL;