summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/lib.h
Unidiff
Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.h') (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index d546c99..4b8dc81 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -162,46 +162,51 @@ namespace XINE {
162 /** 162 /**
163 * test 163 * test
164 */ 164 */
165 Frame currentFrame() const; 165 Frame currentFrame() const;
166 166
167 /** 167 /**
168 * Returns the error code 168 * Returns the error code
169 * XINE_ERROR_NONE 0 169 * XINE_ERROR_NONE 0
170 * XINE_ERROR_NO_INPUT_PLUGIN 1 170 * XINE_ERROR_NO_INPUT_PLUGIN 1
171 * XINE_ERROR_NO_DEMUXER_PLUGIN 2 171 * XINE_ERROR_NO_DEMUXER_PLUGIN 2
172 * XINE_ERROR_DEMUXER_FAILED 3 172 * XINE_ERROR_DEMUXER_FAILED 3
173 */ 173 */
174 int error() const; 174 int error() const;
175 175
176 signals: 176 signals:
177 177
178 void stopped(); 178 void stopped();
179 179
180 protected: 180 protected:
181 virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); 181 virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType );
182 182
183 private: 183 private:
184 void initialize(); 184 void initialize();
185 185
186 void assertInitialized() const;
187
188 mutable ThreadUtil::Mutex m_initGuard;
189 bool m_initialized : 1;
190
186 int m_bytes_per_pixel; 191 int m_bytes_per_pixel;
187 bool m_video:1; 192 bool m_video:1;
188 XineVideoWidget *m_wid; 193 XineVideoWidget *m_wid;
189 xine_t *m_xine; 194 xine_t *m_xine;
190 xine_stream_t *m_stream; 195 xine_stream_t *m_stream;
191 xine_cfg_entry_t *m_config; 196 xine_cfg_entry_t *m_config;
192 xine_vo_driver_t *m_videoOutput; 197 xine_vo_driver_t *m_videoOutput;
193 xine_ao_driver_t* m_audioOutput; 198 xine_ao_driver_t* m_audioOutput;
194 xine_event_queue_t *m_queue; 199 xine_event_queue_t *m_queue;
195 200
196 void handleXineEvent( const xine_event_t* t ); 201 void handleXineEvent( const xine_event_t* t );
197 void handleXineEvent( int type ); 202 void handleXineEvent( int type );
198 void drawFrame( uint8_t* frame, int width, int height, int bytes ); 203 void drawFrame( uint8_t* frame, int width, int height, int bytes );
199 // C -> C++ bridge for the event system 204 // C -> C++ bridge for the event system
200 static void xine_event_handler( void* user_data, const xine_event_t* t); 205 static void xine_event_handler( void* user_data, const xine_event_t* t);
201 static void xine_display_frame( void* user_data, uint8_t* frame , 206 static void xine_display_frame( void* user_data, uint8_t* frame ,
202 int width, int height, int bytes ); 207 int width, int height, int bytes );
203 }; 208 };
204}; 209};
205 210
206 211
207#endif 212#endif