Clean up logging to used standard LL metods.

6 files changed, 148 insertions, 114 deletions

diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index 239981b..da9bcba 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -116,7 +116,7 @@ bool LLAudioEngine::init(const S32 num_channels, void* userdata)
         // Initialize the decode manager
         gAudioDecodeMgrp = new LLAudioDecodeMgr;
 
-        llinfos << "LLAudioEngine::init() AudioEngine successfully initialized" << llendl;
+        LL_INFOS("AudioEngine") << "LLAudioEngine::init() AudioEngine successfully initialized" << llendl;
 
         return true;
 }
@@ -171,7 +171,7 @@ void LLAudioEngine::shutdown()
 // virtual
 void LLAudioEngine::startInternetStream(const std::string& url)
 {
-        llinfos << "entered startInternetStream()" << llendl;
+        LL_INFOS("AudioEngine") << "entered startInternetStream()" << llendl;
 
         if (!mInternetStreamMedia)
         {
@@ -179,7 +179,7 @@ void LLAudioEngine::startInternetStream(const std::string& url)
                 if (mgr)
                 {
                         mInternetStreamMedia = mgr->createSourceFromMimeType(LLURI(url).scheme(), "audio/mpeg"); // assumes that whatever media implementation supports mp3 also supports vorbis.
-                        llinfos << "mInternetStreamMedia is now " << mInternetStreamMedia << llendl;
+                        LL_INFOS("AudioEngine") << "mInternetStreamMedia is now " << mInternetStreamMedia << llendl;
                 }
         }
 
@@ -187,14 +187,14 @@ void LLAudioEngine::startInternetStream(const std::string& url)
                 return;
         
         if (!url.empty()) {
-                llinfos << "Starting internet stream: " << url << llendl;
+                LL_INFOS("AudioEngine") << "Starting internet stream: " << url << llendl;
                 mInternetStreamURL = url;
                 mInternetStreamMedia->navigateTo ( url );
-                llinfos << "Playing....." << llendl;            
+                LL_INFOS("AudioEngine") << "Playing....." << llendl;            
                 mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START);
                 mInternetStreamMedia->updateMedia();
         } else {
-                llinfos << "setting stream to NULL"<< llendl;
+                LL_INFOS("AudioEngine") << "setting stream to NULL"<< llendl;
                 mInternetStreamURL.clear();
                 mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
                 mInternetStreamMedia->updateMedia();
@@ -205,12 +205,12 @@ void LLAudioEngine::startInternetStream(const std::string& url)
 // virtual
 void LLAudioEngine::stopInternetStream()
 {
-        llinfos << "entered stopInternetStream()" << llendl;
+        LL_INFOS("AudioEngine") << "entered stopInternetStream()" << llendl;
         
         if(mInternetStreamMedia)
         {
                 if( ! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP)){
-                        llinfos << "attempting to stop stream failed!" << llendl;
+                        LL_INFOS("AudioEngine") << "attempting to stop stream failed!" << llendl;
                 }
                 mInternetStreamMedia->updateMedia();
         }
@@ -221,7 +221,7 @@ void LLAudioEngine::stopInternetStream()
 // virtual
 void LLAudioEngine::pauseInternetStream(int pause)
 {
-        llinfos << "entered pauseInternetStream()" << llendl;
+        LL_INFOS("AudioEngine") << "entered pauseInternetStream()" << llendl;
 
         if(!mInternetStreamMedia)
                 return;
@@ -230,12 +230,12 @@ void LLAudioEngine::pauseInternetStream(int pause)
         {
                 if(! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_PAUSE))
                 {
-                        llinfos << "attempting to pause stream failed!" << llendl;
+                        LL_INFOS("AudioEngine") << "attempting to pause stream failed!" << llendl;
                 }
         } else {
                 if(! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START))
                 {
-                        llinfos << "attempting to unpause stream failed!" << llendl;
+                        LL_INFOS("AudioEngine") << "attempting to unpause stream failed!" << llendl;
                 }
         }
         mInternetStreamMedia->updateMedia();
@@ -386,7 +386,7 @@ void LLAudioEngine::idle(F32 max_decode_time)
                 LLAudioChannel *channelp = getFreeChannel(max_priority);
                 if (channelp)
                 {
-                        //llinfos << "Replacing source in channel due to priority!" << llendl;
+                        //LL_INFOS("AudioEngine") << "Replacing source in channel due to priority!" << llendl;
                         max_sourcep->setChannel(channelp);
                         channelp->setSource(max_sourcep);
                         if (max_sourcep->isSyncSlave())
@@ -553,7 +553,7 @@ void LLAudioEngine::idle(F32 max_decode_time)
                 {
                         if (!mBuffers[i]->mInUse && mBuffers[i]->mLastUseTimer.getElapsedTimeF32() > 30.f)
                         {
-                                //llinfos << "Flushing unused buffer!" << llendl;
+                                //LL_INFOS("AudioEngine") << "Flushing unused buffer!" << llendl;
                                 mBuffers[i]->mAudioDatap->mBufferp = NULL;
                                 delete mBuffers[i];
                                 mBuffers[i] = NULL;
@@ -666,8 +666,8 @@ LLAudioBuffer *LLAudioEngine::getFreeBuffer()
 
         if (buffer_id >= 0)
         {
-                llinfos << "Taking over unused buffer " << buffer_id << llendl;
-                //llinfos << "Flushing unused buffer!" << llendl;
+                LL_INFOS("AudioEngine") << "Taking over unused buffer " << buffer_id << llendl;
+                //LL_INFOS("AudioEngine") << "Flushing unused buffer!" << llendl;
                 mBuffers[buffer_id]->mAudioDatap->mBufferp = NULL;
                 delete mBuffers[buffer_id];
                 mBuffers[buffer_id] = createBuffer();
@@ -879,7 +879,7 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
                                                                  const S32 type, const LLVector3d &pos_global)
 {
         // Create a new source (since this can't be associated with an existing source.
-        //llinfos << "Localized: " << audio_uuid << llendl;
+        //LL_INFOS("AudioEngine") << "Localized: " << audio_uuid << llendl;
 
         if (mMuted)
         {
@@ -1101,10 +1101,10 @@ bool LLAudioEngine::hasLocalFile(const LLUUID &uuid)
 
 void LLAudioEngine::startNextTransfer()
 {
-        //llinfos << "LLAudioEngine::startNextTransfer()" << llendl;
+        //LL_INFOS("AudioEngine") << "LLAudioEngine::startNextTransfer()" << llendl;
         if (mCurrentTransfer.notNull() || getMuted())
         {
-                //llinfos << "Transfer in progress, aborting" << llendl;
+                //LL_INFOS("AudioEngine") << "Transfer in progress, aborting" << llendl;
                 return;
         }
 
@@ -1285,7 +1285,7 @@ void LLAudioEngine::startNextTransfer()
 
         if (asset_id.notNull())
         {
-                llinfos << "Getting asset data for: " << asset_id << llendl;
+                LL_INFOS("AudioEngine") << "Getting asset data for: " << asset_id << llendl;
                 gAudiop->mCurrentTransfer = asset_id;
                 gAudiop->mCurrentTransferTimer.reset();
                 gAssetStorage->getAssetData(asset_id, LLAssetType::AT_SOUND,
@@ -1293,7 +1293,7 @@ void LLAudioEngine::startNextTransfer()
         }
         else
         {
-                //llinfos << "No pending transfers?" << llendl;
+                //LL_INFOS("AudioEngine") << "No pending transfers?" << llendl;
         }
 }
 
@@ -1303,7 +1303,7 @@ void LLAudioEngine::assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::E
 {
         if (result_code)
         {
-                llinfos << "Boom, error in audio file transfer: " << LLAssetStorage::getErrorString( result_code ) << " (" << result_code << ")" << llendl;
+                LL_INFOS("AudioEngine") << "Boom, error in audio file transfer: " << LLAssetStorage::getErrorString( result_code ) << " (" << result_code << ")" << llendl;
                 // Need to mark data as bad to avoid constant rerequests.
                 LLAudioData *adp = gAudiop->getAudioData(uuid);
                 if (adp)
@@ -1524,7 +1524,7 @@ bool LLAudioSource::isDone()
                 {
                         // We don't have a channel assigned, and it's been
                         // over 5 seconds since we tried to play it.  Don't bother.
-                        //llinfos << "No channel assigned, source is done" << llendl;
+                        //LL_INFOS("AudioEngine") << "No channel assigned, source is done" << llendl;
                         return true;
                 }
                 else
@@ -1684,7 +1684,7 @@ LLAudioChannel::LLAudioChannel() :
 LLAudioChannel::~LLAudioChannel()
 {
         // Need to disconnect any sources which are using this channel.
-        //llinfos << "Cleaning up audio channel" << llendl;
+        //LL_INFOS("AudioEngine") << "Cleaning up audio channel" << llendl;
         if (mCurrentSourcep)
         {
                 mCurrentSourcep->setChannel(NULL);
@@ -1695,12 +1695,12 @@ LLAudioChannel::~LLAudioChannel()
 
 void LLAudioChannel::setSource(LLAudioSource *sourcep)
 {
-        //llinfos << this << ": setSource(" << sourcep << ")" << llendl;
+        //LL_INFOS("AudioEngine") << this << ": setSource(" << sourcep << ")" << llendl;
 
         if (!sourcep)
         {
                 // Clearing the source for this channel, don't need to do anything.
-                //llinfos << "Clearing source for channel" << llendl;
+                //LL_INFOS("AudioEngine") << "Clearing source for channel" << llendl;
                 cleanup();
                 mCurrentSourcep = NULL;
                 mWaiting = false;
@@ -1710,7 +1710,7 @@ void LLAudioChannel::setSource(LLAudioSource *sourcep)
         if (sourcep == mCurrentSourcep)
         {
                 // Don't reallocate the channel, this will make FMOD goofy.
-                //llinfos << "Calling setSource with same source!" << llendl;
+                //LL_INFOS("AudioEngine") << "Calling setSource with same source!" << llendl;
         }
 
         mCurrentSourcep = sourcep;
@@ -1802,7 +1802,7 @@ bool LLAudioData::load()
         if (mBufferp)
         {
                 // We already have this sound in a buffer, don't do anything.
-                llinfos << "Already have a buffer for this sound, don't bother loading!" << llendl;
+                LL_INFOS("AudioEngine") << "Already have a buffer for this sound, don't bother loading!" << llendl;
                 return true;
         }
         
@@ -1810,7 +1810,7 @@ bool LLAudioData::load()
         if (!mBufferp)
         {
                 // No free buffers, abort.
-                llinfos << "Not able to allocate a new audio buffer, aborting." << llendl;
+                LL_INFOS("AudioEngine") << "Not able to allocate a new audio buffer, aborting." << llendl;
                 return false;
         }
 
diff --git a/linden/indra/llaudio/audioengine_openal.cpp b/linden/indra/llaudio/audioengine_openal.cpp
index 002dfba..f13a5fa 100644
--- a/linden/indra/llaudio/audioengine_openal.cpp
+++ b/linden/indra/llaudio/audioengine_openal.cpp
@@ -62,33 +62,33 @@ bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata)
 
         if(!alutInit(NULL, NULL))
         {
-                llwarns << "LLAudioEngine_OpenAL::init() ALUT initialization failed: " << alutGetErrorString (alutGetError ()) << llendl;
+                LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::init() ALUT initialization failed: " << alutGetErrorString (alutGetError ()) << LL_ENDL;
                 return false;
         }
 
-        llinfos << "LLAudioEngine_OpenAL::init() OpenAL successfully initialized" << llendl;
+        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::init() OpenAL successfully initialized" << LL_ENDL;
 
-        llinfos << "OpenAL version: "
-                << ll_safe_string(alGetString(AL_VERSION)) << llendl;
-        llinfos << "OpenAL vendor: "
-                << ll_safe_string(alGetString(AL_VENDOR)) << llendl;
-        llinfos << "OpenAL renderer: "
-                << ll_safe_string(alGetString(AL_RENDERER)) << llendl;
+        LL_INFOS("OpenAL") << "OpenAL version: "
+                << ll_safe_string(alGetString(AL_VERSION)) << LL_ENDL;
+        LL_INFOS("OpenAL") << "OpenAL vendor: "
+                << ll_safe_string(alGetString(AL_VENDOR)) << LL_ENDL;
+        LL_INFOS("OpenAL") << "OpenAL renderer: "
+                << ll_safe_string(alGetString(AL_RENDERER)) << LL_ENDL;
 
         ALint major = alutGetMajorVersion ();
         ALint minor = alutGetMinorVersion ();
-        llinfos << "ALUT version: " << major << "." << minor << llendl;
+        LL_INFOS("OpenAL") << "ALUT version: " << major << "." << minor << LL_ENDL;
 
         ALCdevice *device = alcGetContextsDevice(alcGetCurrentContext());
 
         alcGetIntegerv(device, ALC_MAJOR_VERSION, 1, &major);
         alcGetIntegerv(device, ALC_MAJOR_VERSION, 1, &minor);
-        llinfos << "ALC version: " << major << "." << minor << llendl;
+        LL_INFOS("OpenAL") << "ALC version: " << major << "." << minor << LL_ENDL;
 
-        llinfos << "ALC default device: "
+        LL_INFOS("OpenAL") << "ALC default device: "
                 << ll_safe_string(alcGetString(device,
                                                ALC_DEFAULT_DEVICE_SPECIFIER))
-                << llendl;
+                << LL_ENDL;
 
         return true;
 }
@@ -128,24 +128,24 @@ void LLAudioEngine_OpenAL::allocateListener()
         mListenerp = (LLListener *) new LLListener_OpenAL();
         if(!mListenerp)
         {
-                llwarns << "LLAudioEngine_OpenAL::allocateListener() Listener creation failed" << llendl;
+                LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::allocateListener() Listener creation failed" << LL_ENDL;
         }
 }
 
 // virtual
 void LLAudioEngine_OpenAL::shutdown()
 {
-        llinfos << "About to LLAudioEngine::shutdown()" << llendl;
+        LL_INFOS("OpenAL") << "About to LLAudioEngine::shutdown()" << LL_ENDL;
         LLAudioEngine::shutdown();
 
-        llinfos << "About to alutExit()" << llendl;
+        LL_INFOS("OpenAL") << "About to alutExit()" << LL_ENDL;
         if(!alutExit())
         {
-                llwarns << "Nuts." << llendl;
-                llwarns << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString (alutGetError ()) << llendl;
+                LL_WARNS("OpenAL") << "Nuts." << LL_ENDL;
+                LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString (alutGetError ()) << LL_ENDL;
         }
 
-        llinfos << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << llendl;
+        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << LL_ENDL;
 
         delete mListenerp;
         mListenerp = NULL;
@@ -163,7 +163,7 @@ LLAudioChannel *LLAudioEngine_OpenAL::createChannel()
 
 void LLAudioEngine_OpenAL::setInternalGain(F32 gain)
 {
-        //llinfos << "LLAudioEngine_OpenAL::setInternalGain() Gain: " << gain << llendl;
+        //LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::setInternalGain() Gain: " << gain << LL_ENDL;
         alListenerf(AL_GAIN, gain);
 }
 
@@ -191,7 +191,7 @@ void LLAudioChannelOpenAL::play()
 {
         if (mALSource == AL_NONE)
         {
-                llwarns << "Playing without a mALSource, aborting" << llendl;
+                LL_WARNS("OpenAL") << "Playing without a mALSource, aborting" << LL_ENDL;
                 return;
         }
 
@@ -216,8 +216,8 @@ void LLAudioChannelOpenAL::playSynced(LLAudioChannel *channelp)
                         alGetSourcef(masterchannelp->mALSource, AL_SEC_OFFSET,
                                      &master_offset);
 
-                        llinfos << "Syncing with master at " << master_offset
-                                << "sec" << llendl;
+                        LL_INFOS("OpenAL") << "Syncing with master at " << master_offset
+                                << "sec" << LL_ENDL;
                         // *TODO: detect when this fails, maybe use AL_SAMPLE_
                         alSourcef(mALSource, AL_SEC_OFFSET, master_offset);
                 }
@@ -341,18 +341,18 @@ bool LLAudioBufferOpenAL::loadWAV(const std::string& filename)
                 ALenum error = alutGetError(); 
                 if (gDirUtilp->fileExists(filename))
                 {
-                        llwarns <<
+                        LL_WARNS("OpenAL") <<
                                 "LLAudioBufferOpenAL::loadWAV() Error loading "
                                 << filename
-                                << " " << alutGetErrorString(error) << llendl;
+                                << " " << alutGetErrorString(error) << LL_ENDL;
                 }
                 else
                 {
                         // It's common for the file to not actually exist.
-                        lldebugs <<
+                        LL_DEBUGS("OpenAL") <<
                                 "LLAudioBufferOpenAL::loadWAV() Error loading "
                                  << filename
-                                 << " " << alutGetErrorString(error) << llendl;
+                                 << " " << alutGetErrorString(error) << LL_ENDL;
                 }
                 return false;
         }
@@ -376,7 +376,7 @@ U32 LLAudioBufferOpenAL::getLength()
 void LLAudioEngine_OpenAL::initWind()
 {
         ALenum error;
-        llinfos << "LLAudioEngine_OpenAL::initWind() start" << llendl;
+        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::initWind() start" << LL_ENDL;
 
         mNumEmptyWindALBuffers = MAX_NUM_WIND_BUFFERS;
 
@@ -386,7 +386,7 @@ void LLAudioEngine_OpenAL::initWind()
         
         if((error=alGetError()) != AL_NO_ERROR)
         {
-                llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind sources: "<<error<<llendl;
+                LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::initWind() Error creating wind sources: "<<error<<LL_ENDL;
         }
 
         mWindGen = new LLWindGen<WIND_SAMPLE_T>;
@@ -399,16 +399,16 @@ void LLAudioEngine_OpenAL::initWind()
 
         if(mWindBuf==NULL)
         {
-                llerrs << "LLAudioEngine_OpenAL::initWind() Error creating wind memory buffer" << llendl;
+                LL_ERRS("OpenAL") << "LLAudioEngine_OpenAL::initWind() Error creating wind memory buffer" << LL_ENDL;
                 mEnableWind=false;
         }
 
-        llinfos << "LLAudioEngine_OpenAL::initWind() done" << llendl;
+        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::initWind() done" << LL_ENDL;
 }
 
 void LLAudioEngine_OpenAL::cleanupWind()
 {
-        llinfos << "LLAudioEngine_OpenAL::cleanupWind()" << llendl;
+        LL_INFOS("OpenAL") << "LLAudioEngine_OpenAL::cleanupWind()" << LL_ENDL;
 
         if (mWindSource != AL_NONE)
         {
@@ -484,7 +484,7 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
         mNumEmptyWindALBuffers = llmin(mNumEmptyWindALBuffers + processed * 3 - unprocessed, MAX_NUM_WIND_BUFFERS-unprocessed);
         mNumEmptyWindALBuffers = llmax(mNumEmptyWindALBuffers, 0);
 
-        //llinfos << "mNumEmptyWindALBuffers: " << mNumEmptyWindALBuffers       <<" (" << unprocessed << ":" << processed << ")" << llendl;
+        //LL_INFOS("OpenAL") << "mNumEmptyWindALBuffers: " << mNumEmptyWindALBuffers    <<" (" << unprocessed << ":" << processed << ")" << LL_ENDL;
 
         while(processed--) // unqueue old buffers
         {
@@ -495,7 +495,7 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
                 error = alGetError();
                 if(error != AL_NO_ERROR)
                 {
-                        llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (unqueuing) buffers" << llendl;
+                        LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::updateWind() error swapping (unqueuing) buffers" << LL_ENDL;
                 }
                 else
                 {
@@ -511,7 +511,7 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
                 alGenBuffers(1,&buffer);
                 if((error=alGetError()) != AL_NO_ERROR)
                 {
-                        llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << error << llendl;
+                        LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::initWind() Error creating wind buffer: " << error << LL_ENDL;
                         break;
                 }
 
@@ -523,12 +523,12 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
                              mWindBufFreq);
                 error = alGetError();
                 if(error != AL_NO_ERROR)
-                        llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (bufferdata) buffers" << llendl;
+                        LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::updateWind() error swapping (bufferdata) buffers" << LL_ENDL;
                 
                 alSourceQueueBuffers(mWindSource, 1, &buffer);
                 error = alGetError();
                 if(error != AL_NO_ERROR)
-                        llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping (queuing) buffers" << llendl;
+                        LL_WARNS("OpenAL") << "LLAudioEngine_OpenAL::updateWind() error swapping (queuing) buffers" << LL_ENDL;
 
                 --mNumEmptyWindALBuffers;
         }
@@ -539,6 +539,6 @@ void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude)
         {
                 alSourcePlay(mWindSource);
 
-                llinfos << "Wind had stopped - probably ran out of buffers - restarting: " << (unprocessed+mNumEmptyWindALBuffers) << " now queued." << llendl;
+                LL_INFOS("OpenAL") << "Wind had stopped - probably ran out of buffers - restarting: " << (unprocessed+mNumEmptyWindALBuffers) << " now queued." << LL_ENDL;
         }
 }
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 5d6a648..5a8a8e0 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -49,6 +49,7 @@ extern "C" {
 
 #include "llmediaimplgstreamer_syms.h"
 
+#include "llerror.h"
 // register this impl with media manager factory
 static LLMediaImplRegister sLLMediaImplGStreamerReg( "LLMediaImplGStreamer", new LLMediaImplGStreamerMaker() );
 
@@ -73,12 +74,13 @@ LLMediaImplGStreamer () :
         mTextureFormatType ( LL_MEDIA_UNSIGNED_INT_8_8_8_8_REV ),
         mPump ( NULL ),
         mPlaybin ( NULL ),
-        mVideoSink ( NULL )
+        mVideoSink ( NULL ),
+        mState( GST_STATE_NULL )
 #ifdef LL_GST_SOUNDSINK
         ,mAudioSink ( NULL )
 #endif // LL_GST_SOUNDSINK
 {
-        DEBUGMSG("constructing media...");
+        LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL;
 
         setMediaDepth(4);
 
@@ -99,11 +101,12 @@ LLMediaImplGStreamer () :
 
         if (NULL == getenv("LL_GSTREAMER_EXTERNAL")) {
                 // instantiate and connect a custom video sink
+                LL_DEBUGS("MediaManager") << "extrenal video sink..." << LL_ENDL;
                 mVideoSink =
                         GST_SLVIDEO(llgst_element_factory_make ("private-slvideo", "slvideo"));
                 if (!mVideoSink)
                 {
-                        WARNMSG("Could not instantiate private-slvideo element.");
+                        LL_WARNS("MediaImpl") << "Could not instantiate private-slvideo element." << LL_ENDL;
                         // todo: cleanup.
                         return; // error
                 }
@@ -111,12 +114,13 @@ LLMediaImplGStreamer () :
                 g_object_set(mPlaybin, "video-sink", mVideoSink, NULL);
 
 #ifdef LL_GST_SOUNDSINK
+                LL_DEBUGS("MediaManager") << "extrenal audio sink..." << LL_ENDL;
                 // instantiate and connect a custom audio sink
                 mAudioSink =
                         GST_SLSOUND(llgst_element_factory_make ("private-slsound", "slsound"));
                 if (!mAudioSink)
                 {
-                        WARNMSG("Could not instantiate private-slsound element.");
+                        LL_WARN("MediaImpl") << "Could not instantiate private-slsound element." << LL_ENDL;
                         // todo: cleanup.
                         return; // error
                 }
@@ -149,7 +153,7 @@ int LLMediaImplGStreamer::getTextureFormatInternal() const
 LLMediaImplGStreamer::
 ~LLMediaImplGStreamer ()
 {
-        DEBUGMSG("dtor of media...");
+        LL_DEBUGS("MediaImpl") << ("dtor of media...") << LL_ENDL;
         unload();
 }
 
@@ -176,21 +180,23 @@ startup ( LLMediaManagerData* init_data )
                                     "libgstvideo-0.10.so.0",
                                     "libgstaudio-0.10.so.0") )
                 {
-                        WARNMSG("Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled.");
+                        LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL;
                         return false;
                 }
 
                 if (llgst_segtrap_set_enabled)
                         llgst_segtrap_set_enabled(FALSE);
                 else
-                        WARNMSG("gst_segtrap_set_enabled() is not available; Automated crash-reporter may cease to function until next restart.");
+                {
+                    LL_WARNS("MediaImpl") << "gst_segtrap_set_enabled() is not available; Automated crash-reporter may cease to function until next restart." << LL_ENDL;
+                }
 
                 // Protect against GStreamer resetting the locale, yuck.
                 static std::string saved_locale;
                 saved_locale = setlocale(LC_ALL, NULL);
                 if (0 == llgst_init_check(NULL, NULL, NULL))
                 {
-                        WARNMSG("GST init failed for unspecified reason.");
+                    LL_WARNS("MediaImpl") << "GST init failed for unspecified reason." << LL_ENDL;
                         setlocale(LC_ALL, saved_locale.c_str() );
                         return false;
                 }
@@ -222,7 +228,7 @@ closedown()
 //
 //#define LL_GST_REPORT_STATE_CHANGES
 #ifdef LL_GST_REPORT_STATE_CHANGES
-static char* get_gst_state_name(GstState state)
+static const char* get_gst_state_name(GstState state)
 {
         switch (state) {
         case GST_STATE_VOID_PENDING: return "VOID_PENDING";
@@ -241,17 +247,7 @@ LLMediaImplGStreamer::bus_callback (GstBus     *bus,
                                     GstMessage *message,
                                     gpointer    data)
 {
-        if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_STATE_CHANGED &&
-            GST_MESSAGE_TYPE(message) != GST_MESSAGE_BUFFERING)
-        {
-                DEBUGMSG("Got GST message type: %s",
-                        LLGST_MESSAGE_TYPE_NAME (message));
-        }
-        else
-        {
-                DEBUGMSG("Got GST message type: %s",
-                         LLGST_MESSAGE_TYPE_NAME (message));
-        }
+        LL_DEBUGS("MediaCallback") << "Got GST message type: " << LLGST_MESSAGE_TYPE_NAME (message) << LL_ENDL;
 
         LLMediaImplGStreamer *impl = (LLMediaImplGStreamer*)data;
 
@@ -262,7 +258,7 @@ LLMediaImplGStreamer::bus_callback (GstBus     *bus,
                 {
                         gint percent = 0;
                         llgst_message_parse_buffering(message, &percent);
-                        DEBUGMSG("GST buffering: %d%%", percent);
+                        LL_DEBUGS("MediaBuffering") << "GST buffering: " << percent << "%%" << LL_ENDL;
                         LLMediaEvent event( impl, percent );
                         impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
 
@@ -279,16 +275,18 @@ LLMediaImplGStreamer::bus_callback (GstBus     *bus,
                                                 &pending_state);
 #ifdef LL_GST_REPORT_STATE_CHANGES
                 // not generally very useful, and rather spammy.
-                DEBUGMSG("state change (old,<new>,pending): %s,<%s>,%s",
-                         get_gst_state_name(old_state),
-                         get_gst_state_name(new_state),
-                         get_gst_state_name(pending_state));
+                LL_DEBUGS("MediaState") << "GST state change (old,<new>,pending): "<< get_gst_state_name(old_state) << ",<" << get_gst_state_name(new_state) << ">," << get_gst_state_name(pending_state) << LL_ENDL;
 #endif // LL_GST_REPORT_STATE_CHANGES
 
                 switch (new_state) {
                 case GST_STATE_VOID_PENDING:
                         break;
                 case GST_STATE_NULL:
+                        LL_DEBUGS("MediaImpl") << "State changed to NULL" << LL_ENDL;
+                        if (impl->getState() == GST_STATE_PLAYING) { // We got stoped by gstremer...
+                            impl->play();
+                            LL_DEBUGS("MediaImpl") << "Trying to restart." << LL_ENDL;
+                        }
                         break;
                 case GST_STATE_READY:
                         break;
@@ -309,11 +307,12 @@ LLMediaImplGStreamer::bus_callback (GstBus     *bus,
                 gchar *debug = NULL;
 
                 llgst_message_parse_error (message, &err, &debug);
-                WARNMSG("GST error: %s", err->message);
+                LL_WARNS("MediaImpl") << "GST Error: " << err->message << LL_ENDL;
                 g_error_free (err);
                 g_free (debug);
 
                 impl->addCommand(LLMediaBase::COMMAND_STOP);
+                //impl->addCommand(LLMediaBase::COMMAND_START);
 
                 break;
         }
@@ -324,7 +323,8 @@ LLMediaImplGStreamer::bus_callback (GstBus     *bus,
                         gchar *debug = NULL;
                         
                         llgst_message_parse_info (message, &err, &debug);
-                        INFOMSG("GST info: %s", err->message);
+                        LL_INFOS("MediaImpl") << "GST info: " << err->message
+                            << LL_ENDL;
                         g_error_free (err);
                         g_free (debug);
                 }
@@ -335,18 +335,36 @@ LLMediaImplGStreamer::bus_callback (GstBus     *bus,
                 gchar *debug = NULL;
 
                 llgst_message_parse_warning (message, &err, &debug);
-                WARNMSG("GST warning: %s", err->message);
+                LL_WARNS("MediaImpl") << "GST warning: " <<  err->message
+                    << LL_ENDL;
                 g_error_free (err);
                 g_free (debug);
 
                 break;
         }
+        case GST_MESSAGE_TAG: {
+#if 0
+                GstTagList *tag_list;
+                gchar *title;
+                gchar *artist;
+                llgst_message_parse_tag(message, &tag_list);
+                gboolean hazTitle = llgst_tag_list_get_string(tag_list,
+                        GST_TAG_TITLE, &title);
+                gboolean hazArtist = llgst_tag_list_get_string(tag_list,
+                        GST_TAG_ARTIST, &artist);
+                if(hazTitle) 
+                    LL_INFOS("MediaInfo") << "Title is " << title << LL_ENDL;
+                if(hazArtist) 
+                    LL_INFOS("MediaInfo") << "Artist is " << artist << LL_ENDL;
+#endif
+                break;
+        }
         case GST_MESSAGE_EOS:
                 /* end-of-stream */
-                DEBUGMSG("GST end-of-stream.");
+                LL_DEBUGS("MediaImpl") << "GST end-of-stream." << LL_ENDL;
                 if (impl->isLooping())
                 {
-                        DEBUGMSG("looping media...");
+                        LL_DEBUGS("MediaImpl") << "looping media..." << LL_ENDL;
                         impl->stop();
                         impl->play();
                 }
@@ -374,7 +392,8 @@ bool
 LLMediaImplGStreamer::
 navigateTo ( const std::string urlIn )
 {
-        DEBUGMSG("Setting media URI: %s", urlIn.c_str());
+        LL_DEBUGS("MediaImpl") << "Setting media URI: " << urlIn.c_str()
+            << LL_ENDL;
 
         if (NULL == mPump
 #ifdef LL_GST_SOUNDSINK
@@ -412,10 +431,11 @@ bool
 LLMediaImplGStreamer::
 unload ()
 {
-        DEBUGMSG("unloading media...");
+        LL_DEBUGS("MediaImpl") << "unloading media..." << LL_ENDL;
         if (mPlaybin)
         {
                 llgst_element_set_state (mPlaybin, GST_STATE_NULL);
+                mState = GST_STATE_NULL;
                 llgst_object_unref (GST_OBJECT (mPlaybin));
                 mPlaybin = NULL;
         }
@@ -443,7 +463,7 @@ bool
 LLMediaImplGStreamer::
 updateMedia ()
 {
-        DEBUGMSG("updating media...");
+        //LL_DEBUGS("MediaImpl") << "updating media..." << LL_ENDL;
         
         // sanity check
         if (NULL == mPump
@@ -452,7 +472,7 @@ updateMedia ()
 #endif
             || NULL == mPlaybin)
         {
-                DEBUGMSG("dead media...");
+                LL_DEBUGS("MediaImpl") << "dead media..." << LL_ENDL;
                 return false;
         }
 
@@ -460,36 +480,33 @@ updateMedia ()
         switch (nextCommand())
         {
         case LLMediaBase::COMMAND_START:
-                DEBUGMSG("COMMAND_START");
+                LL_DEBUGS("MediaImpl") << "COMMAND_START" << LL_ENDL;
                 if (getStatus() == LLMediaBase::STATUS_PAUSED ||
                     getStatus() == LLMediaBase::STATUS_NAVIGATING ||
                     getStatus() == LLMediaBase::STATUS_STOPPED)
                 {
-                        DEBUGMSG("doing COMMAND_START");
                         play();
                         setStatus(LLMediaBase::STATUS_STARTED);
                         clearCommand();
                 }
                 break;
         case LLMediaBase::COMMAND_STOP:
-                DEBUGMSG("COMMAND_STOP");
-                DEBUGMSG("doing COMMAND_STOP");
+                LL_DEBUGS("MediaImpl") << "COMMAND_STOP" << LL_ENDL;
                 stop();
                 setStatus(LLMediaBase::STATUS_STOPPED);
                 clearCommand();
                 break;
         case LLMediaBase::COMMAND_PAUSE:
-                DEBUGMSG("COMMAND_PAUSE");
+                LL_DEBUGS("MediaImpl") << "COMMAND_PAUSE" << LL_ENDL;
                 if (getStatus() == LLMediaBase::STATUS_STARTED)
                 {
-                        DEBUGMSG("doing COMMAND_PAUSE");
                         pause();
                         setStatus(LLMediaBase::STATUS_PAUSED);
                         clearCommand();
                 }
                 break;
         default:
-                DEBUGMSG("COMMAND_?");
+                LL_INFOS("MediaImpl") << "Unknown command" << LL_ENDL;
                 clearCommand();
                 break;
         case LLMediaBase::COMMAND_NONE:
@@ -507,7 +524,7 @@ updateMedia ()
                 GST_OBJECT_LOCK(mVideoSink);
                 if (mVideoSink->retained_frame_ready)
                 {
-                        DEBUGMSG("NEW FRAME ");
+                        LL_DEBUGS("MediaImpl") <<"NEW FRAME " << LL_ENDL;
                         if (mVideoSink->retained_frame_width != getMediaWidth() ||
                             mVideoSink->retained_frame_height != getMediaHeight())
                                 // *TODO: also check for change in format
@@ -527,8 +544,9 @@ updateMedia ()
                                         mTextureFormatType = LL_MEDIA_UNSIGNED_INT_8_8_8_8_REV;
                                 }
                                 mMediaRowbytes = neww * newd;
-                                DEBUGMSG("video container resized to %dx%d",
-                                         neww, newh);
+                                LL_DEBUGS("MediaImpl")
+                                    << "video container resized to " <<
+                                    neww <<"x"<< newh << LL_ENDL;
                                 
                                 delete[] mediaData;
                                 mediaData = new unsigned char[mMediaRowbytes *
@@ -568,9 +586,10 @@ bool
 LLMediaImplGStreamer::
 stop ()
 {
-        DEBUGMSG("stopping media...");
+        LL_DEBUGS("MediaImpl") << "stopping media..." << LL_ENDL;
         // todo: error-check this?
         llgst_element_set_state(mPlaybin, GST_STATE_READY);
+        mState = GST_STATE_READY;
         return true;
 }
 
@@ -580,9 +599,10 @@ bool
 LLMediaImplGStreamer::
 play ()
 {
-        DEBUGMSG("playing media...");
+        LL_DEBUGS("MediaImpl") << "playing media..." << LL_ENDL;
         // todo: error-check this?
         llgst_element_set_state(mPlaybin, GST_STATE_PLAYING);
+        mState = GST_STATE_PLAYING;
         return true;
 }
 
@@ -592,9 +612,10 @@ bool
 LLMediaImplGStreamer::
 pause ()
 {
-        DEBUGMSG("pausing media...");
+        LL_DEBUGS("MediaImpl") <<"pausing media..." << LL_ENDL;
         // todo: error-check this?
         llgst_element_set_state(mPlaybin, GST_STATE_PAUSED);
+        mState = GST_STATE_PAUSED;
         return true;
 };
 
@@ -624,8 +645,8 @@ seek( double time )
                                 GST_SEEK_TYPE_SET, gint64(time*1000000000.0F),
                                 GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
         }
-        DEBUGMSG("MEDIA SEEK REQUEST to %fsec result was %d",
-                 float(time), int(success));
+        LL_DEBUGS("MediaImpl") << "MEDIA SEEK REQUEST to " << float(time)
+            << "sec result was " << int(success) << LL_ENDL;
         return success;
 }
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 247b0ce..4d0638a 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -100,9 +100,11 @@ class LLMediaImplGStreamer:
                 GMainLoop *mPump; // event pump for this media
                 GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
+                GstState mState;
 #ifdef LL_GST_SOUNDSINK
                 GstSLSound *mAudioSink;
 #endif // LL_GST_SOUNDSINK
+                GstState getState() const { return mState; }
 };
 
 class LLMediaImplGStreamerMaker : public LLMediaImplMaker
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index 16c731f..57256e6 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -40,6 +40,7 @@
 # include "llmediaimplllmozlib.h"
 #endif
 
+#include "llerror.h"
 LLMediaManager* LLMediaManager::sInstance = 0;
 
 
@@ -75,6 +76,7 @@ void LLMediaManager::initClass( LLMediaManagerData* init_data )
         if ( ! sInstance )
                 sInstance = new LLMediaManager();
 
+        LL_DEBUGS("MediaManager") << "LLMediaManager::initClass" << LL_ENDL;
         // Initialize impl classes here - this breaks the encapsulation model
         // but some of the initialization takes a long time and we only want to
         // do it once at app startup before any of the impls have been created
@@ -84,10 +86,12 @@ void LLMediaManager::initClass( LLMediaManagerData* init_data )
         LLMediaImplExample2::startup( init_data );
 
 #if LL_QUICKTIME_ENABLED
+        LL_DEBUGS("MediaManager") << "LLMediaManager::initClass: starting quicktime." << LL_ENDL;
         LLMediaImplQuickTime::startup( init_data );
 #endif // LL_QUICKTIME_ENABLED
 
 #if LL_GSTREAMER_ENABLED
+        LL_DEBUGS("MediaManager") << "LLMediaManager::initClass: starting gstreamer" << LL_ENDL;
         LLMediaImplGStreamer::startup( init_data );
 #endif // LL_GSTREAMER_ENABLED
 }
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index d7bb64c..f3b08f9 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -40,6 +40,13 @@
                                                 </array>
                                         <key>tags</key>
                                                 <array>
+                                                <string>OpenAL</string>
+                                                <string>AudioEngine</string>
+                                                <string>MediaImpl</string>
+                                                <string>MediaInfo</string>
+                                                <string>MediaCallback</string>
+                                                <string>MediaBuffering</string>
+                                                <string>MediaState</string>
                                                 </array>
                                 </map>
                         </array>