aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-18 03:20:54 -0500
committerJacek Antonelli2009-04-18 03:42:53 -0500
commit0c2b0d0767c48aa3cb02d378c7ff021f66284c40 (patch)
treef5051395a0da531b8f01926ceaf58e3fa2fd6317
parentRemoved redundant play() from LLMediaImplGStreamer::navigateTo(). (diff)
downloadmeta-impy-0c2b0d0767c48aa3cb02d378c7ff021f66284c40.zip
meta-impy-0c2b0d0767c48aa3cb02d378c7ff021f66284c40.tar.gz
meta-impy-0c2b0d0767c48aa3cb02d378c7ff021f66284c40.tar.bz2
meta-impy-0c2b0d0767c48aa3cb02d378c7ff021f66284c40.tar.xz
LLMediaImplGStreamer::startPlay() is protected, LLGstPlayThread friend.
-rw-r--r--ChangeLog.txt3
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.h8
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 @@
12009-04-18 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-04-18 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/llmedia/llmediaimplgstreamer.h:
4 LLMediaImplGStreamer::startPlay() is protected, LLGstPlayThread friend.
5
3 * linden/indra/llmedia/llmediaimplgstreamer.cpp: 6 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 Removed redundant play() from LLMediaImplGStreamer::navigateTo(). 7 Removed redundant play() from LLMediaImplGStreamer::navigateTo().
5 8
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;
57class LLMediaImplGStreamer: 57class LLMediaImplGStreamer:
58 public LLMediaImplCommon 58 public LLMediaImplCommon
59{ 59{
60 friend class LLGstPlayThread;
61
60 public: 62 public:
61 LLMediaImplGStreamer (); 63 LLMediaImplGStreamer ();
62 virtual ~LLMediaImplGStreamer (); 64 virtual ~LLMediaImplGStreamer ();
@@ -97,10 +99,12 @@ class LLMediaImplGStreamer:
97 /* virtual */ bool seek( double time ); 99 /* virtual */ bool seek( double time );
98 /* virtual */ bool setVolume( float volume ); 100 /* virtual */ bool setVolume( float volume );
99 101
100 void startPlay(); 102 LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
101 103
104 protected:
105
106 void startPlay();
102 107
103 LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
104 108
105 private: 109 private:
106 110