summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/lib.h
Unidiff
Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.h') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.h22
1 files changed, 1 insertions, 21 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 34b85b9..aba2ec9 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -46,25 +46,25 @@
46class XineVideoWidget; 46class XineVideoWidget;
47 47
48namespace XINE { 48namespace XINE {
49 49
50 /** 50 /**
51 * Lib wrapps the simple interface 51 * Lib wrapps the simple interface
52 * of libxine for easy every day use 52 * of libxine for easy every day use
53 * This will become a full C++ Wrapper 53 * This will become a full C++ Wrapper
54 * It supports playing, pausing, info, 54 * It supports playing, pausing, info,
55 * stooping, seeking. 55 * stooping, seeking.
56 */ 56 */
57 class Frame; 57 class Frame;
58 class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread 58 class Lib : public ThreadUtil::Channel
59 { 59 {
60 Q_OBJECT 60 Q_OBJECT
61 public: 61 public:
62 Lib(XineVideoWidget* = 0); 62 Lib(XineVideoWidget* = 0);
63 ~Lib(); 63 ~Lib();
64 static int majorVersion(); 64 static int majorVersion();
65 static int minorVersion(); 65 static int minorVersion();
66 static int subVersion(); 66 static int subVersion();
67 67
68 68
69 void resize ( const QSize &s ); 69 void resize ( const QSize &s );
70 70
@@ -174,45 +174,25 @@ namespace XINE {
174 */ 174 */
175 int error() const; 175 int error() const;
176 176
177 signals: 177 signals:
178 178
179 void stopped(); 179 void stopped();
180 180
181 void initialized(); 181 void initialized();
182 182
183 protected: 183 protected:
184 virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); 184 virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType );
185 185
186 virtual void run();
187
188 private: 186 private:
189 void initialize();
190
191 void assertInitialized() const;
192
193 enum { XineMessageType = 1, InitializationMessageType };
194
195 struct XineMessage : public ThreadUtil::ChannelMessage
196 {
197 XineMessage( int _xineEvent ) : ThreadUtil::ChannelMessage( XineMessageType ),
198 xineEvent( _xineEvent )
199 {}
200
201 int xineEvent;
202 };
203
204 mutable ThreadUtil::Mutex m_initGuard;
205 bool m_initialized : 1;
206
207 int m_bytes_per_pixel; 187 int m_bytes_per_pixel;
208 bool m_video:1; 188 bool m_video:1;
209 XineVideoWidget *m_wid; 189 XineVideoWidget *m_wid;
210 xine_t *m_xine; 190 xine_t *m_xine;
211 xine_stream_t *m_stream; 191 xine_stream_t *m_stream;
212 xine_cfg_entry_t *m_config; 192 xine_cfg_entry_t *m_config;
213 xine_vo_driver_t *m_videoOutput; 193 xine_vo_driver_t *m_videoOutput;
214 xine_ao_driver_t* m_audioOutput; 194 xine_ao_driver_t* m_audioOutput;
215 xine_event_queue_t *m_queue; 195 xine_event_queue_t *m_queue;
216 196
217 void handleXineEvent( const xine_event_t* t ); 197 void handleXineEvent( const xine_event_t* t );
218 void handleXineEvent( int type ); 198 void handleXineEvent( int type );