Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index 4b8dc81..34b85b9 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -54,9 +54,10 @@ namespace XINE { | |||
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 { | 58 | class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread |
59 | { | ||
59 | Q_OBJECT | 60 | Q_OBJECT |
60 | public: | 61 | public: |
61 | Lib(XineVideoWidget* = 0); | 62 | Lib(XineVideoWidget* = 0); |
62 | ~Lib(); | 63 | ~Lib(); |
@@ -176,16 +177,31 @@ namespace XINE { | |||
176 | signals: | 177 | signals: |
177 | 178 | ||
178 | void stopped(); | 179 | void stopped(); |
179 | 180 | ||
181 | void initialized(); | ||
182 | |||
180 | protected: | 183 | protected: |
181 | virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); | 184 | virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); |
182 | 185 | ||
186 | virtual void run(); | ||
187 | |||
183 | private: | 188 | private: |
184 | void initialize(); | 189 | void initialize(); |
185 | 190 | ||
186 | void assertInitialized() const; | 191 | void assertInitialized() const; |
187 | 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 | |||
188 | mutable ThreadUtil::Mutex m_initGuard; | 204 | mutable ThreadUtil::Mutex m_initGuard; |
189 | bool m_initialized : 1; | 205 | bool m_initialized : 1; |
190 | 206 | ||
191 | int m_bytes_per_pixel; | 207 | int m_bytes_per_pixel; |