From a6c1d49480c27b24ecb0e7778dd44782c5fe20b1 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 18 Apr 2009 02:56:02 -0500 Subject: LLMediaImplGStreamer::play() is no-op if already playing. --- ChangeLog.txt | 4 ++++ linden/indra/llmedia/llmediaimplgstreamer.cpp | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 0cfbbaf..f9ecbc3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,10 @@ 2009-04-18 Jacek Antonelli * linden/indra/llmedia/llmediaimplgstreamer.cpp: + LLMediaImplGStreamer::play() is no-op if already playing. + + + * linden/indra/llmedia/llmediaimplgstreamer.cpp: Removed some useless code from LLMediaImplGStreamer::startPlay(). diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 5cf7eed..3fd6d6e 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -792,6 +792,13 @@ bool LLMediaImplGStreamer::play() if (!mPlaybin || mState == GST_STATE_NULL) return true; + + if( getState() == GST_STATE_PLAYING ) + { + LL_DEBUGS("MediaImpl") << "... but already playing." << LL_ENDL; + return true; + } + // Clean up the existing thread, if any. if( mPlayThread != NULL && mPlayThread->isStopped()) { -- cgit v1.1