author | harlekin <harlekin> | 2002-11-10 13:40:33 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-11-10 13:40:33 (UTC) |
commit | ddfc3c3073216d6a9ef15b26e3836b9c3eb2085c (patch) (unidiff) | |
tree | 5bef89c4dc116d09c1864778127ca9106e1f29ae /noncore | |
parent | ea3334042e9625c0f67c9a7293a482849f60e4e2 (diff) | |
download | opie-ddfc3c3073216d6a9ef15b26e3836b9c3eb2085c.zip opie-ddfc3c3073216d6a9ef15b26e3836b9c3eb2085c.tar.gz opie-ddfc3c3073216d6a9ef15b26e3836b9c3eb2085c.tar.bz2 |
fixed seeking and further adaption to the new api
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 11 |
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 | |||
@@ -201,7 +201,8 @@ bool Lib::isSeekable() { | |||
201 | 201 | ||
202 | void Lib::seekTo( int time ) { | 202 | void Lib::seekTo( int time ) { |
203 | //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( | 203 | //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( |
204 | xine_play( m_stream, 0, time ); | 204 | // since its now milliseconds we need *1000 |
205 | xine_play( m_stream, 0, time*1000 ); | ||
205 | } | 206 | } |
206 | 207 | ||
207 | 208 | ||
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 | |||
@@ -90,6 +90,7 @@ namespace XINE { | |||
90 | int currentPosition()/*const*/; | 90 | int currentPosition()/*const*/; |
91 | //in seconds | 91 | //in seconds |
92 | int currentTime()/*const*/; | 92 | int currentTime()/*const*/; |
93 | |||
93 | int length() /*const*/; | 94 | int length() /*const*/; |
94 | 95 | ||
95 | bool isSeekable()/*const*/; | 96 | bool isSeekable()/*const*/; |
@@ -172,7 +173,9 @@ namespace XINE { | |||
172 | int error() /*const*/; | 173 | int error() /*const*/; |
173 | 174 | ||
174 | signals: | 175 | signals: |
176 | |||
175 | void stopped(); | 177 | void stopped(); |
178 | |||
176 | private: | 179 | private: |
177 | int m_bytes_per_pixel; | 180 | int m_bytes_per_pixel; |
178 | int m_length, m_pos, m_time; | 181 | int m_length, m_pos, m_time; |
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 | |||
@@ -439,7 +439,7 @@ static int null_gui_data_exchange( xine_vo_driver_t* self, | |||
439 | return 0; | 439 | return 0; |
440 | } | 440 | } |
441 | 441 | ||
442 | static void null_exit( xine_vo_driver_t* self ){ | 442 | static void null_dispose ( xine_vo_driver_t* self ){ |
443 | null_driver_t* this = (null_driver_t*)self; | 443 | null_driver_t* this = (null_driver_t*)self; |
444 | free ( this ); | 444 | free ( this ); |
445 | } | 445 | } |
@@ -478,7 +478,7 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | |||
478 | vo->vo_driver.set_property = null_set_property; | 478 | vo->vo_driver.set_property = null_set_property; |
479 | vo->vo_driver.get_property_min_max = null_get_property_min_max; | 479 | vo->vo_driver.get_property_min_max = null_get_property_min_max; |
480 | vo->vo_driver.gui_data_exchange = null_gui_data_exchange; | 480 | vo->vo_driver.gui_data_exchange = null_gui_data_exchange; |
481 | vo->vo_driver.exit = null_exit; | 481 | vo->vo_driver.dispose = null_dispose; |
482 | vo->vo_driver.redraw_needed = null_redraw_needed; | 482 | vo->vo_driver.redraw_needed = null_redraw_needed; |
483 | 483 | ||
484 | 484 | ||
@@ -490,9 +490,9 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | |||
490 | return ( xine_vo_driver_t*) vo; | 490 | return ( xine_vo_driver_t*) vo; |
491 | } | 491 | } |
492 | 492 | ||
493 | #if 0 | ||
493 | static vo_info_t vo_info_null = { | 494 | static vo_info_t vo_info_null = { |
494 | 5, | 495 | 5, |
495 | "null plugin", | ||
496 | XINE_VISUAL_TYPE_FB | 496 | XINE_VISUAL_TYPE_FB |
497 | }; | 497 | }; |
498 | 498 | ||
@@ -501,6 +501,8 @@ vo_info_t *get_video_out_plugin_info(){ | |||
501 | return &vo_info_null; | 501 | return &vo_info_null; |
502 | } | 502 | } |
503 | 503 | ||
504 | #endif | ||
505 | |||
504 | /* this is special for this device */ | 506 | /* this is special for this device */ |
505 | /** | 507 | /** |
506 | * We know that we will be controled by the XINE LIB++ | 508 | * We know that we will be controled by the XINE LIB++ |
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 | |||
@@ -79,6 +79,8 @@ void XineControl::play( const QString& fileName ) { | |||
79 | 79 | ||
80 | if ( !libXine->play( fileName ) ) { | 80 | if ( !libXine->play( fileName ) ) { |
81 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); | 81 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); |
82 | // toggle stop so the the play button is reset | ||
83 | mediaPlayerState->setPlaying( false ); | ||
82 | return; | 84 | return; |
83 | } | 85 | } |
84 | mediaPlayerState->setPlaying( true ); | 86 | mediaPlayerState->setPlaying( true ); |
@@ -225,10 +227,19 @@ QString XineControl::getMetaInfo() { | |||
225 | } | 227 | } |
226 | 228 | ||
227 | QString XineControl::getErrorCode() { | 229 | QString XineControl::getErrorCode() { |
230 | |||
228 | int errorCode = libXine->error(); | 231 | int errorCode = libXine->error(); |
229 | 232 | ||
233 | qDebug( QString("ERRORCODE: %1 ").arg(errorCode) ); | ||
234 | |||
230 | if ( errorCode == 1 ) { | 235 | if ( errorCode == 1 ) { |
231 | return tr( "No input plugin found for this media type" ); | 236 | return tr( "No input plugin found for this media type" ); |
237 | } else if ( errorCode == 2 ) { | ||
238 | return tr( "No demux plugin found for this media type" ); | ||
239 | } else if ( errorCode == 3 ) { | ||
240 | return tr( "Demuxing failed for this media type" ); | ||
241 | } else if ( errorCode == 4 ) { | ||
242 | return tr( "Malformed MRL" ); | ||
232 | } else { | 243 | } else { |
233 | return tr( "Some other error" ); | 244 | return tr( "Some other error" ); |
234 | } | 245 | } |