-Emit Progress from the xine Engine to Global::statusMessage

-Change ThreadUtil to pass data and const char* among threads

4 files changed, 28 insertions, 15 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 8afb318..f1b9773 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -36,9 +36,9 @@
 #include "lib.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
-using namespace Opie::Core;
+#include <qpe/global.h>
 
 /* QT */
 #include <qtextstream.h>
 #include <qdir.h>
@@ -325,21 +325,31 @@ void Lib::setWidget( XineVideoWidget *widget )
 
 void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
 {
     assert( sendType == ThreadUtil::Channel::OneWay );
-    handleXineEvent( msg->type() );
+    handleXineEvent( msg->type(), msg->data(), msg->msg() );
     delete msg;
 }
 
 void Lib::handleXineEvent( const xine_event_t* t ) {
-    send( new ThreadUtil::ChannelMessage( t->type ), OneWay );
+    int prog = -1; const char* name = 0;
+    if ( t->type == XINE_EVENT_PROGRESS ) {
+        xine_progress_data_t *pt = static_cast<xine_progress_data_t*>( t->data );
+        prog = pt->percent;
+        name = pt->description;
+    }
+
+    send( new ThreadUtil::ChannelMessage( t->type, prog, name ),  OneWay );
 }
 
-void Lib::handleXineEvent( int type ) {
+void Lib::handleXineEvent( int type, int data, const char* name ) {
     assert( m_initialized );
 
     if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) {
         emit stopped();
+    }else if ( type == XINE_EVENT_PROGRESS ) {
+        QString str = name == 0 ? QString::null : QString::fromUtf8( name );
+        Global::statusMessage( tr( "Progress: %1 %2" ).arg( name, data ) );;
     }
 }
 
 
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 0ff14d0..dfddc2a 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -202,9 +202,9 @@ namespace XINE {
         xine_ao_driver_t* m_audioOutput;
         xine_event_queue_t *m_queue;
 
         void handleXineEvent( const xine_event_t* t );
-        void handleXineEvent( int type );
+        void handleXineEvent( int type, int data, const char* name );
         void drawFrame( uint8_t* frame, int width, int height, int bytes );
         // C -> C++ bridge for the event system
         static void xine_event_handler( void* user_data, const xine_event_t* t);
         static void xine_display_frame( void* user_data, uint8_t* frame ,
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp
index 6ed9853..b5cac61 100644
--- a/noncore/multimedia/opieplayer2/threadutil.cpp
+++ b/noncore/multimedia/opieplayer2/threadutil.cpp
@@ -125,9 +125,9 @@ void WaitCondition::wakeAll()
 }
 
 struct Thread::Data
 {
-    Data() : isRunning( false ) 
+    Data() : isRunning( false )
     {}
 
     pthread_t self;
     Mutex guard;
@@ -187,18 +187,18 @@ void Thread::start()
 {
     AutoLock lock( d->guard );
 
     if ( d->isRunning ) {
-        odebug << "ThreadUtil::Thread::start() called for running thread." << oendl; 
+        odebug << "ThreadUtil::Thread::start() called for running thread." << oendl;
         return;
     }
 
     pthread_attr_t attributes;
     pthread_attr_init( &attributes );
     pthread_attr_setscope( &attributes, PTHREAD_SCOPE_SYSTEM );
     int err = pthread_create( &d->self, &attributes, start_thread, ( void* )d );
     if ( err != 0 ) {
-        odebug << "ThreadUtil::Thread::start() : can't create thread: " << strerror( err ) << "" << oendl; 
+        odebug << "ThreadUtil::Thread::start() : can't create thread: " << strerror( err ) << "" << oendl;
         pthread_attr_destroy( &attributes );
         return;
     }
     pthread_attr_destroy( &attributes );
@@ -268,13 +268,12 @@ void OnewayNotifier::wakeUp()
 
     emit awake();
 }
 
-ChannelMessage::ChannelMessage( int type )
-    : m_type( type ), m_isCall( false ), m_replied( false ),
-      m_inEventHandler( false )
-{
-}
+ChannelMessage::ChannelMessage( int type, int data, const char* msg )
+    : m_type( type ), m_data( data ), m_msg( msg ),
+      m_isCall( false ), m_replied( false ), m_inEventHandler( false )
+{}
 
 ChannelMessage::~ChannelMessage()
 {
     if ( m_guard.isLocked() )
@@ -284,9 +283,9 @@ ChannelMessage::~ChannelMessage()
 void ChannelMessage::reply()
 {
     if ( !m_isCall )
     {
-        odebug << "ChannelMessage::reply() - can't reply oneway message!" << oendl; 
+        odebug << "ChannelMessage::reply() - can't reply oneway message!" << oendl;
         return;
     }
 
     if ( m_inEventHandler )
diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h
index 2e83d3a..f97a18b 100644
--- a/noncore/multimedia/opieplayer2/threadutil.h
+++ b/noncore/multimedia/opieplayer2/threadutil.h
@@ -132,20 +132,24 @@ namespace ThreadUtil
     class ChannelMessage
     {
         friend class Channel;
     public:
-        ChannelMessage( int type = -1 );
+        ChannelMessage( int type = -1, int data = -1, const char* msg = 0 );
         virtual ~ChannelMessage();
 
         int type() const { return m_type; }
+        int data() const { return m_data; }
+        const char* msg()const { return m_msg;  }
 
         void reply();
 
     private:
         ChannelMessage( const ChannelMessage & );
         ChannelMessage &operator=( const ChannelMessage );
 
         int m_type;
+        int m_data;
+        const char *m_msg;
         bool m_isCall : 1;
         bool m_replied : 1;
         bool m_inEventHandler : 1;
         Mutex m_guard;