summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-11-10 13:40:33 (UTC)
committer harlekin <harlekin>2002-11-10 13:40:33 (UTC)
commitddfc3c3073216d6a9ef15b26e3836b9c3eb2085c (patch) (side-by-side diff)
tree5bef89c4dc116d09c1864778127ca9106e1f29ae
parentea3334042e9625c0f67c9a7293a482849f60e4e2 (diff)
downloadopie-ddfc3c3073216d6a9ef15b26e3836b9c3eb2085c.zip
opie-ddfc3c3073216d6a9ef15b26e3836b9c3eb2085c.tar.gz
opie-ddfc3c3073216d6a9ef15b26e3836b9c3eb2085c.tar.bz2
fixed seeking and further adaption to the new api
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/lib.h3
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c8
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp11
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
@@ -203,3 +203,4 @@ 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
@@ -92,2 +92,3 @@ namespace XINE {
int currentTime()/*const*/;
+
int length() /*const*/;
@@ -174,3 +175,5 @@ namespace XINE {
signals:
+
void stopped();
+
private:
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
@@ -441,3 +441,3 @@ 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;
@@ -480,3 +480,3 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf,
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;
@@ -492,5 +492,5 @@ 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
@@ -503,2 +503,4 @@ 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
@@ -81,2 +81,4 @@ void XineControl::play( const QString& fileName ) {
QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() );
+ // toggle stop so the the play button is reset
+ mediaPlayerState->setPlaying( false );
return;
@@ -227,6 +229,15 @@ 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 {