summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp9
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h4
2 files changed, 9 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index eba837e..8b9413f 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -49,6 +49,7 @@ XineControl::XineControl( QObject *parent, const char *name )
49 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); 49 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
50 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); 50 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
51 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); 51 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
52 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
52} 53}
53 54
54XineControl::~XineControl() { 55XineControl::~XineControl() {
@@ -75,16 +76,20 @@ void XineControl::play( const QString& fileName ) {
75 76
76 // determine if slider is shown 77 // determine if slider is shown
77 // mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) ); 78 // mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) );
78 mediaPlayerState->setIsStreaming( libXine->isSeekable() ); 79 mediaPlayerState->setIsStreaming( !libXine->isSeekable() );
79 // which gui (video / audio) 80 // which gui (video / audio)
80 mediaPlayerState->setView( whichGui ); 81 mediaPlayerState->setView( whichGui );
81 length(); 82 length();
82 position(); 83 position();
83} 84}
84 85
86void XineControl::nextMedia() {
87 mediaPlayerState->setNext();
88}
89
85void XineControl::stop( bool isSet ) { 90void XineControl::stop( bool isSet ) {
86 if ( !isSet) { 91 if ( !isSet) {
87 libXine->stop(); 92 libXine->stop( );
88 mediaPlayerState->setList(); 93 mediaPlayerState->setList();
89 //mediaPlayerState->setPlaying( false ); 94 //mediaPlayerState->setPlaying( false );
90 } else { 95 } else {
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index c7aefd4..712e298 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -55,8 +55,8 @@ public slots:
55 // get length of media file and set it 55 // get length of media file and set it
56 void length(); 56 void length();
57 long position(); 57 long position();
58 58 void nextMedia();
59 void videoResized ( const QSize &s ); 59 void videoResized ( const QSize &s );
60 60
61private: 61private:
62 XINE::Lib *libXine; 62 XINE::Lib *libXine;