Merge branch gst-thread into gst-revamp

Conflicts:
	linden/indra/llmedia/llmediaimplgstreamer.cpp

1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 37eaf53..32e6bd1 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -48,6 +48,7 @@ extern "C" {
 }
 
 #include "llmediaimplgstreamervidplug.h"
+#include "llgstplaythread.h"
 
 class LLMediaManagerData;
 class LLMediaImplMaker;
@@ -96,6 +97,9 @@ class LLMediaImplGStreamer:
                 /* virtual */ bool seek( double time );
             /* virtual */ bool setVolume( float volume );
 
+                void startPlay();
+
+
                 LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
         private:
@@ -121,6 +125,8 @@ class LLMediaImplGStreamer:
                 GstSLVideo *mVideoSink;
                 GstState mState;
                 GstState getState() const { return mState; }
+
+                LLGstPlayThread *mPlayThread;
 };
 
 class LLMediaImplGStreamerMaker : public LLMediaImplMaker