author | simon <simon> | 2002-12-10 23:24:48 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-10 23:24:48 (UTC) |
commit | 7f4bd526d59aacbf750e9ee58337b6cf640ba28b (patch) (unidiff) | |
tree | 162f849f529cefe24ff5c6f9c0bdceee0cde772c /noncore/multimedia/opieplayer2/lib.h | |
parent | 763b6ad10dbb7a23c446347cb7fb88cfbadd3e27 (diff) | |
download | opie-7f4bd526d59aacbf750e9ee58337b6cf640ba28b.zip opie-7f4bd526d59aacbf750e9ee58337b6cf640ba28b.tar.gz opie-7f4bd526d59aacbf750e9ee58337b6cf640ba28b.tar.bz2 |
- added an m_initialized flag and a guard for it, along with an
assertion method called from all methods that access variables depending
on initialization (basically all :)
Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 5 |
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 | |||
@@ -174,24 +174,29 @@ namespace XINE { | |||
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 ); |