fixed seeking and further adaption to the new api

4 files changed, 21 insertions, 4 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 1ebbbd8..19b64e8 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -202,5 +202,6 @@ bool Lib::isSeekable() {
 void Lib::seekTo( int time ) {
     //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_(
-    xine_play( m_stream, 0, time );
+    // since its now milliseconds we need *1000
+    xine_play( m_stream, 0, time*1000 );
 }
 
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 191dbbd..38938a1 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -91,4 +91,5 @@ namespace XINE {
         //in seconds
         int currentTime()/*const*/;
+
         int length() /*const*/;
 
@@ -173,5 +174,7 @@ namespace XINE {
 
     signals:
+
         void stopped();
+
     private:
         int m_bytes_per_pixel;
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index dcdfae6..b1f4811 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -440,5 +440,5 @@ static int null_gui_data_exchange( xine_vo_driver_t* self,
 }
 
-static void null_exit( xine_vo_driver_t* self ){
+static void null_dispose ( xine_vo_driver_t* self ){
   null_driver_t* this = (null_driver_t*)self;
   free ( this );
@@ -479,5 +479,5 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf,
   vo->vo_driver.get_property_min_max  = null_get_property_min_max;
   vo->vo_driver.gui_data_exchange     = null_gui_data_exchange;
-  vo->vo_driver.exit                  = null_exit;
+  vo->vo_driver.dispose               = null_dispose;
   vo->vo_driver.redraw_needed         = null_redraw_needed;
     
@@ -491,7 +491,7 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf,
 }
 
+#if 0
 static vo_info_t vo_info_null = {
   5,
-  "null plugin",
   XINE_VISUAL_TYPE_FB
 };
@@ -502,4 +502,6 @@ vo_info_t *get_video_out_plugin_info(){
 }
 
+#endif
+
 /* this is special for this device */
 /**
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 31ac9dc..03176b3 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -80,4 +80,6 @@ void XineControl::play( const QString& fileName ) {
     if ( !libXine->play( fileName ) ) {
         QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() );
+        // toggle stop so the the play button is reset
+        mediaPlayerState->setPlaying( false );
         return;
     }
@@ -226,8 +228,17 @@ QString XineControl::getMetaInfo() {
 
 QString XineControl::getErrorCode() {
+
     int errorCode = libXine->error();
 
+    qDebug( QString("ERRORCODE: %1 ").arg(errorCode) );
+
     if ( errorCode == 1 ) {
         return tr( "No input plugin found for this media type" );
+    } else if ( errorCode == 2 ) {
+         return tr( "No demux plugin found for this media type" );
+    } else if ( errorCode == 3 ) {
+        return tr( "Demuxing failed for this media type" );
+    } else if ( errorCode == 4 ) {
+        return tr( "Malformed MRL" );
     } else {
         return tr( "Some other error" );