From 0c2b0d0767c48aa3cb02d378c7ff021f66284c40 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 18 Apr 2009 03:20:54 -0500 Subject: LLMediaImplGStreamer::startPlay() is protected, LLGstPlayThread friend. --- ChangeLog.txt | 3 +++ linden/indra/llmedia/llmediaimplgstreamer.h | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index fe0593c..243170f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,8 @@ 2009-04-18 Jacek Antonelli + * linden/indra/llmedia/llmediaimplgstreamer.h: + LLMediaImplGStreamer::startPlay() is protected, LLGstPlayThread friend. + * linden/indra/llmedia/llmediaimplgstreamer.cpp: Removed redundant play() from LLMediaImplGStreamer::navigateTo(). diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h index 32e6bd1..4145f33 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.h +++ b/linden/indra/llmedia/llmediaimplgstreamer.h @@ -57,6 +57,8 @@ class LLMediaImplMaker; class LLMediaImplGStreamer: public LLMediaImplCommon { + friend class LLGstPlayThread; + public: LLMediaImplGStreamer (); virtual ~LLMediaImplGStreamer (); @@ -97,10 +99,12 @@ class LLMediaImplGStreamer: /* virtual */ bool seek( double time ); /* virtual */ bool setVolume( float volume ); - void startPlay(); + LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;}; + protected: + + void startPlay(); - LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;}; private: -- cgit v1.1