summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/lib.cpp
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp15
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;
#include <qtextstream.h>
#include <qdir.h>
#include <qgfx_qws.h>
/* STD */
#include <assert.h>
+#include <unistd.h>
typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
int width, int height,int bytes );
extern "C" {
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 )
else
start();
}
void Lib::run()
{
- odebug << "Lib::run() started" << oendl;
+ odebug << "Lib::run() started" << oendl;
initialize();
m_initialized = true;
- odebug << "Lib::run() finished" << oendl;
+ odebug << "Lib::run() finished" << oendl;
}
void Lib::initialize()
{
m_duringInitialization = true;
m_xine = xine_new( );
@@ -143,13 +144,13 @@ void Lib::initialize()
}
m_queue = xine_event_new_queue (m_stream);
xine_event_create_listener_thread (m_queue, xine_event_handler, this);
- ::null_preload_decoders( m_stream );
+ ::null_preload_decoders( m_stream );
m_duringInitialization = false;
}
Lib::~Lib() {
assert( isRunning() == false );
@@ -214,13 +215,13 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) {
return xine_play( m_stream, startPos, start_time);
}
void Lib::stop() {
assert( m_initialized );
- odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl;
+ odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl;
xine_stop( m_stream );
}
void Lib::pause( bool toggle ) {
assert( m_initialized );
@@ -326,15 +327,15 @@ int Lib::error() const {
void Lib::ensureInitialized()
{
if ( m_initialized )
return;
- odebug << "waiting for initialization thread to finish" << oendl;
+ odebug << "waiting for initialization thread to finish" << oendl;
wait();
- odebug << "initialization thread finished!" << oendl;
+ odebug << "initialization thread finished!" << oendl;
}
void Lib::setWidget( XineVideoWidget *widget )
{
m_wid = widget;
resize ( m_wid-> size ( ) );
@@ -421,13 +422,13 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame,
}
void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
assert( m_initialized );
if ( !m_video ) {
- owarn << "not showing video now" << oendl;
+ owarn << "not showing video now" << oendl;
return;
}
assert( m_wid );
m_wid-> setVideoFrame ( frame, width, height, bytes );