author | zecke <zecke> | 2004-09-23 19:02:47 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-23 19:02:47 (UTC) |
commit | 9a7e9427062e820f7b654e77e051213c3f53e134 (patch) (unidiff) | |
tree | b37f5d9dd37a846551c44feca40c24c56ffc7a05 /noncore/multimedia/opieplayer2/lib.cpp | |
parent | 69bf1d25b253167f3d2ef4b162c42aec4d8bbf7a (diff) | |
download | opie-9a7e9427062e820f7b654e77e051213c3f53e134.zip opie-9a7e9427062e820f7b654e77e051213c3f53e134.tar.gz opie-9a7e9427062e820f7b654e77e051213c3f53e134.tar.bz2 |
-OTicker is in libqtaux so we need to link it to avoid weird crashes
-Some function names have changed in xine update them
-Start to merge video_out_fb.c changes into nullvideo and give credit
to the source of it
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 | |||
@@ -46,6 +46,7 @@ using namespace Opie::Core; | |||
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 ); |
@@ -108,10 +109,10 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) | |||
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() |
@@ -146,7 +147,7 @@ void Lib::initialize() | |||
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 | } |
@@ -217,7 +218,7 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) { | |||
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 | ||
@@ -329,9 +330,9 @@ void Lib::ensureInitialized() | |||
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 ) |
@@ -424,7 +425,7 @@ 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 | ||