diff options
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h index 4145f33..d1566e3 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.h +++ b/linden/indra/llmedia/llmediaimplgstreamer.h | |||
@@ -97,9 +97,9 @@ class LLMediaImplGStreamer: | |||
97 | /* virtual */ int getTextureFormatType() const; | 97 | /* virtual */ int getTextureFormatType() const; |
98 | /* virtual */ int getTextureFormatInternal() const; | 98 | /* virtual */ int getTextureFormatInternal() const; |
99 | /* virtual */ bool seek( double time ); | 99 | /* virtual */ bool seek( double time ); |
100 | /* virtual */ bool setVolume( float volume ); | 100 | /* virtual */ bool setVolume( float volume ); |
101 | 101 | ||
102 | LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;}; | 102 | LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;}; |
103 | 103 | ||
104 | protected: | 104 | protected: |
105 | 105 | ||
@@ -108,24 +108,24 @@ class LLMediaImplGStreamer: | |||
108 | 108 | ||
109 | private: | 109 | private: |
110 | 110 | ||
111 | // misc | 111 | // misc |
112 | bool unload(); | 112 | bool unload(); |
113 | bool pause(); | 113 | bool pause(); |
114 | bool stop(); | 114 | bool stop(); |
115 | bool play(); | 115 | bool play(); |
116 | 116 | ||
117 | static gboolean bus_callback (GstBus *bus, | 117 | static gboolean bus_callback (GstBus *bus, |
118 | GstMessage *message, | 118 | GstMessage *message, |
119 | gpointer data); | 119 | gpointer data); |
120 | unsigned char* mediaData; | ||
121 | int mMediaRowbytes; | ||
122 | 120 | ||
123 | int mTextureFormatPrimary; | 121 | unsigned char* mediaData; |
124 | int mTextureFormatType; | 122 | int mMediaRowbytes; |
123 | int mTextureFormatPrimary; | ||
124 | int mTextureFormatType; | ||
125 | 125 | ||
126 | // GStreamer-specific | 126 | // GStreamer-specific |
127 | GMainLoop *mPump; // event pump for this media | 127 | GMainLoop *mPump; // event pump for this media |
128 | GstElement *mPlaybin; | 128 | GstElement *mPlaybin; |
129 | GstSLVideo *mVideoSink; | 129 | GstSLVideo *mVideoSink; |
130 | GstState mState; | 130 | GstState mState; |
131 | GstState getState() const { return mState; } | 131 | GstState getState() const { return mState; } |
@@ -135,12 +135,12 @@ class LLMediaImplGStreamer: | |||
135 | 135 | ||
136 | class LLMediaImplGStreamerMaker : public LLMediaImplMaker | 136 | class LLMediaImplGStreamerMaker : public LLMediaImplMaker |
137 | { | 137 | { |
138 | public: | 138 | public: |
139 | LLMediaImplGStreamerMaker(); | 139 | LLMediaImplGStreamerMaker(); |
140 | LLMediaImplGStreamer* create() | 140 | LLMediaImplGStreamer* create() |
141 | { | 141 | { |
142 | return new LLMediaImplGStreamer(); | 142 | return new LLMediaImplGStreamer(); |
143 | } | 143 | } |
144 | }; | 144 | }; |
145 | 145 | ||
146 | ///////////////////////////////////////////////////////////////////////// | 146 | ///////////////////////////////////////////////////////////////////////// |