summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-10-29 05:01:23 -0400
committerJonathan Yap <none@none>2011-10-29 05:01:23 -0400
commit526f71053a9fb18e95993343a0fd826023bda683 (patch)
tree1de02f3e8843b9afe38cc613d268b3b6ce3b61a3 /indra
parent5663f41a7a3dafb4650b49ebc0c86140136239cd (diff)
STORM-591 Comment out debugging llinfos lines
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvieweraudio.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index 8fd1ca3807..10ba54356c 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -65,12 +65,12 @@ void LLViewerAudio::registerIdleListener()
void LLViewerAudio::startInternetStreamWithAutoFade(std::string streamURI)
{
- llinfos << "DBG streamURI: " << streamURI << llendl;
+/* llinfos << "DBG streamURI: " << streamURI << llendl;
llinfos << "DBG mNextStreamURI: " << mNextStreamURI << llendl;
if (mFadeState == FADE_OUT) {llinfos << "DBG mFadeState: FADE_OUT " << llendl;}
if (mFadeState == FADE_IN) {llinfos << "DBG mFadeState: FADE_IN " << llendl;}
if (mFadeState == FADE_IDLE) {llinfos << "DBG mFadeState: FADE_IDLE " << llendl;}
-
+*/
// Old and new stream are identical
if (mNextStreamURI == streamURI)
{
@@ -86,13 +86,13 @@ void LLViewerAudio::startInternetStreamWithAutoFade(std::string streamURI)
if (!gAudiop->getInternetStreamURL().empty())
{
mFadeState = FADE_OUT;
-llinfos << "DBG new mFadeState: OUT" << llendl;
+//llinfos << "DBG new mFadeState: OUT" << llendl;
}
// Otherwise the new stream can be faded in
else
{
mFadeState = FADE_IN;
-llinfos << "DBG new mFadeState: IN" << llendl;
+//llinfos << "DBG new mFadeState: IN" << llendl;
gAudiop->startInternetStream(mNextStreamURI);
startFading();
@@ -123,10 +123,10 @@ bool LLViewerAudio::onIdleUpdate()
{
if (mDone)
{
- if (mFadeState == FADE_OUT) {llinfos << "DBG mFadeState: FADE_OUT " << llendl;}
+/* if (mFadeState == FADE_OUT) {llinfos << "DBG mFadeState: FADE_OUT " << llendl;}
if (mFadeState == FADE_IN) {llinfos << "DBG mFadeState: FADE_IN " << llendl;}
if (mFadeState == FADE_IDLE) {llinfos << "DBG mFadeState: FADE_IDLE " << llendl;}
-
+*/
// This should be a rare or never occurring state.
if (mFadeState == FADE_IDLE)
{
@@ -144,7 +144,7 @@ bool LLViewerAudio::onIdleUpdate()
if (!mNextStreamURI.empty())
{
mFadeState = FADE_IN;
-llinfos << "DBG new mFadeState: IN" << llendl;
+//llinfos << "DBG new mFadeState: IN" << llendl;
gAudiop->startInternetStream(mNextStreamURI);
startFading();
return false;
@@ -152,7 +152,7 @@ llinfos << "DBG new mFadeState: IN" << llendl;
else
{
mFadeState = FADE_IDLE;
-llinfos << "DBG new mFadeState: IDLE" << llendl;
+//llinfos << "DBG new mFadeState: IDLE" << llendl;
deregisterIdleListener();
return true; // Stop calling onIdleUpdate
}
@@ -164,12 +164,12 @@ llinfos << "DBG new mFadeState: IDLE" << llendl;
mFadeState = FADE_OUT;
startFading();
return false;
-llinfos << "DBG new mFadeState: OUT" << llendl;
+//llinfos << "DBG new mFadeState: OUT" << llendl;
}
else
{
mFadeState = FADE_IDLE;
-llinfos << "DBG new mFadeState: IDLE" << llendl;
+//llinfos << "DBG new mFadeState: IDLE" << llendl;
deregisterIdleListener();
return true; // Stop calling onIdleUpdate
}
@@ -181,12 +181,12 @@ llinfos << "DBG new mFadeState: IDLE" << llendl;
void LLViewerAudio::stopInternetStreamWithAutoFade()
{
-llinfos << "DBG stopping stream" << llendl;
+//llinfos << "DBG stopping stream" << llendl;
mFadeState = FADE_IDLE;
-llinfos << "DBG new mFadeState: IDLE" << llendl;
+//llinfos << "DBG new mFadeState: IDLE" << llendl;
mNextStreamURI = LLStringUtil::null;
mDone = true;
-llinfos << "DBG mDone: true" << llendl;
+//llinfos << "DBG mDone: true" << llendl;
gAudiop->startInternetStream(LLStringUtil::null);
gAudiop->stopInternetStream();
@@ -194,7 +194,7 @@ llinfos << "DBG mDone: true" << llendl;
void LLViewerAudio::startFading()
{
-llinfos << "DBG startFading" << llendl;
+//llinfos << "DBG startFading" << llendl;
if(mDone)
{
@@ -208,7 +208,7 @@ llinfos << "DBG startFading" << llendl;
stream_fade_timer.reset();
stream_fade_timer.setTimerExpirySec(mFadeTime);
mDone = false;
-llinfos << "DBG mDone: false" << llendl;
+//llinfos << "DBG mDone: false" << llendl;
}
}
@@ -349,7 +349,7 @@ void audio_update_volume(bool force_update)
F32 music_volume = gSavedSettings.getF32("AudioLevelMusic");
BOOL music_muted = gSavedSettings.getBOOL("MuteMusic");
F32 fade_volume = LLViewerAudio::getInstance()->getFadeVolume();
-llinfos << "DBG fade_volume:" << fade_volume << llendl;
+//llinfos << "DBG fade_volume:" << fade_volume << llendl;
music_volume = mute_volume * master_volume * music_volume * fade_volume;
gAudiop->setInternetStreamGain (music_muted ? 0.f : music_volume);