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
@@ -40,24 +40,25 @@
40extern MediaPlayerState *mediaPlayerState; 40extern MediaPlayerState *mediaPlayerState;
41extern VideoWidget *videoUI; 41extern VideoWidget *videoUI;
42XineControl::XineControl( QObject *parent, const char *name ) 42XineControl::XineControl( QObject *parent, const char *name )
43 : QObject( parent, name ) { 43 : QObject( parent, name ) {
44 libXine = new XINE::Lib(videoUI->vidWidget() ); 44 libXine = new XINE::Lib(videoUI->vidWidget() );
45 45
46 connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ))); 46 connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & )));
47 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); 47 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) );
48 connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); 48 connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) );
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() {
55 delete libXine; 56 delete libXine;
56} 57}
57 58
58void XineControl::play( const QString& fileName ) { 59void XineControl::play( const QString& fileName ) {
59 m_fileName = fileName; 60 m_fileName = fileName;
60 libXine->play( fileName ); 61 libXine->play( fileName );
61 mediaPlayerState->setPlaying( true ); 62 mediaPlayerState->setPlaying( true );
62 // default to audio view until we know how to handle video 63 // default to audio view until we know how to handle video
63 // MediaDetect mdetect; 64 // MediaDetect mdetect;
@@ -66,34 +67,38 @@ void XineControl::play( const QString& fileName ) {
66 qDebug("Nicht erkannter Dateityp"); 67 qDebug("Nicht erkannter Dateityp");
67 return; 68 return;
68 } 69 }
69 70
70 if (whichGui == 'a') { 71 if (whichGui == 'a') {
71 libXine->setShowVideo( false ); 72 libXine->setShowVideo( false );
72 } else { 73 } else {
73 libXine->setShowVideo( true ); 74 libXine->setShowVideo( true );
74 } 75 }
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 {
91 // play again 96 // play again
92 } 97 }
93} 98}
94 99
95/** 100/**
96 * Pause playback 101 * Pause playback
97 * @isSet 102 * @isSet
98 */ 103 */
99void XineControl::pause( bool isSet) { 104void XineControl::pause( bool isSet) {
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
@@ -46,26 +46,26 @@ public:
46 int m_length; 46 int m_length;
47 47
48public slots: 48public slots:
49 void play( const QString& fileName ); 49 void play( const QString& fileName );
50 void stop( bool ); 50 void stop( bool );
51 void pause( bool ); 51 void pause( bool );
52 void setFullscreen( bool ); 52 void setFullscreen( bool );
53 long currentTime(); 53 long currentTime();
54 void seekTo( long ); 54 void seekTo( long );
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;
63 MediaDetect mdetect; 63 MediaDetect mdetect;
64 long m_currentTime; 64 long m_currentTime;
65 long m_position; 65 long m_position;
66 QString m_fileName; 66 QString m_fileName;
67signals: 67signals:
68 void positionChanged( long ); 68 void positionChanged( long );
69 69
70}; 70};
71 71