Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 1ab5c96..248221b 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -43,12 +43,13 @@ using namespace Opie::Core; | |||
43 | #include <qtextstream.h> | 43 | #include <qtextstream.h> |
44 | #include <qdir.h> | 44 | #include <qdir.h> |
45 | #include <qgfx_qws.h> | 45 | #include <qgfx_qws.h> |
46 | 46 | ||
47 | /* STD */ | 47 | /* STD */ |
48 | #include <assert.h> | 48 | #include <assert.h> |
49 | #include <unistd.h> | ||
49 | 50 | ||
50 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 51 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
51 | int width, int height,int bytes ); | 52 | int width, int height,int bytes ); |
52 | 53 | ||
53 | extern "C" { | 54 | extern "C" { |
54 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * ); | 55 | xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * ); |
@@ -105,16 +106,16 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) | |||
105 | else | 106 | else |
106 | start(); | 107 | start(); |
107 | } | 108 | } |
108 | 109 | ||
109 | void Lib::run() | 110 | void Lib::run() |
110 | { | 111 | { |
111 | odebug << "Lib::run() started" << oendl; | 112 | odebug << "Lib::run() started" << oendl; |
112 | initialize(); | 113 | initialize(); |
113 | m_initialized = true; | 114 | m_initialized = true; |
114 | odebug << "Lib::run() finished" << oendl; | 115 | odebug << "Lib::run() finished" << oendl; |
115 | } | 116 | } |
116 | 117 | ||
117 | void Lib::initialize() | 118 | void Lib::initialize() |
118 | { | 119 | { |
119 | m_duringInitialization = true; | 120 | m_duringInitialization = true; |
120 | m_xine = xine_new( ); | 121 | m_xine = xine_new( ); |
@@ -143,13 +144,13 @@ void Lib::initialize() | |||
143 | } | 144 | } |
144 | 145 | ||
145 | m_queue = xine_event_new_queue (m_stream); | 146 | m_queue = xine_event_new_queue (m_stream); |
146 | 147 | ||
147 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); | 148 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); |
148 | 149 | ||
149 | ::null_preload_decoders( m_stream ); | 150 | ::null_preload_decoders( m_stream ); |
150 | 151 | ||
151 | m_duringInitialization = false; | 152 | m_duringInitialization = false; |
152 | } | 153 | } |
153 | 154 | ||
154 | Lib::~Lib() { | 155 | Lib::~Lib() { |
155 | assert( isRunning() == false ); | 156 | assert( isRunning() == false ); |
@@ -214,13 +215,13 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) { | |||
214 | return xine_play( m_stream, startPos, start_time); | 215 | return xine_play( m_stream, startPos, start_time); |
215 | } | 216 | } |
216 | 217 | ||
217 | void Lib::stop() { | 218 | void Lib::stop() { |
218 | assert( m_initialized ); | 219 | assert( m_initialized ); |
219 | 220 | ||
220 | odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl; | 221 | odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl; |
221 | xine_stop( m_stream ); | 222 | xine_stop( m_stream ); |
222 | } | 223 | } |
223 | 224 | ||
224 | void Lib::pause( bool toggle ) { | 225 | void Lib::pause( bool toggle ) { |
225 | assert( m_initialized ); | 226 | assert( m_initialized ); |
226 | 227 | ||
@@ -326,15 +327,15 @@ int Lib::error() const { | |||
326 | 327 | ||
327 | void Lib::ensureInitialized() | 328 | void Lib::ensureInitialized() |
328 | { | 329 | { |
329 | if ( m_initialized ) | 330 | if ( m_initialized ) |
330 | return; | 331 | return; |
331 | 332 | ||
332 | odebug << "waiting for initialization thread to finish" << oendl; | 333 | odebug << "waiting for initialization thread to finish" << oendl; |
333 | wait(); | 334 | wait(); |
334 | odebug << "initialization thread finished!" << oendl; | 335 | odebug << "initialization thread finished!" << oendl; |
335 | } | 336 | } |
336 | 337 | ||
337 | void Lib::setWidget( XineVideoWidget *widget ) | 338 | void Lib::setWidget( XineVideoWidget *widget ) |
338 | { | 339 | { |
339 | m_wid = widget; | 340 | m_wid = widget; |
340 | resize ( m_wid-> size ( ) ); | 341 | resize ( m_wid-> size ( ) ); |
@@ -421,13 +422,13 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame, | |||
421 | } | 422 | } |
422 | 423 | ||
423 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { | 424 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { |
424 | assert( m_initialized ); | 425 | assert( m_initialized ); |
425 | 426 | ||
426 | if ( !m_video ) { | 427 | if ( !m_video ) { |
427 | owarn << "not showing video now" << oendl; | 428 | owarn << "not showing video now" << oendl; |
428 | return; | 429 | return; |
429 | } | 430 | } |
430 | 431 | ||
431 | assert( m_wid ); | 432 | assert( m_wid ); |
432 | 433 | ||
433 | m_wid-> setVideoFrame ( frame, width, height, bytes ); | 434 | m_wid-> setVideoFrame ( frame, width, height, bytes ); |