summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/xinecontrol.cpp
Unidiff
Diffstat (limited to 'noncore/multimedia/opieplayer2/xinecontrol.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 33889d0..d08ff04 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -46,7 +46,6 @@ XineControl::XineControl( QObject *parent, const char *name )
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( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( setPosition( long ) ) );
50 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); 49 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
51 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); 50 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
52 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); 51 connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
@@ -58,6 +57,7 @@ XineControl::~XineControl() {
58} 57}
59 58
60void XineControl::play( const QString& fileName ) { 59void XineControl::play( const QString& fileName ) {
60 m_fileName = fileName;
61 libXine->play( fileName ); 61 libXine->play( fileName );
62 mediaPlayerState->setPlaying( true ); 62 mediaPlayerState->setPlaying( true );
63 // default to audio view until we know how to handle video 63 // default to audio view until we know how to handle video
@@ -111,7 +111,7 @@ void XineControl::length() {
111 111
112long XineControl::position() { 112long XineControl::position() {
113 m_position = ( currentTime() ); 113 m_position = ( currentTime() );
114 mediaPlayerState->setPosition( m_position ); 114 mediaPlayerState->updatePosition( m_position );
115 long emitPos = (long)m_position; 115 long emitPos = (long)m_position;
116 emit positionChanged( emitPos ); 116 emit positionChanged( emitPos );
117 if(mediaPlayerState->isPlaying) 117 if(mediaPlayerState->isPlaying)
@@ -126,7 +126,8 @@ void XineControl::setFullscreen( bool isSet ) {
126} 126}
127 127
128void XineControl::seekTo( long second ) { 128void XineControl::seekTo( long second ) {
129 // libXine-> 129 qDebug("seek triggered!!");
130 libXine->play( m_fileName , 0, (int)second );
130} 131}
131 132
132 133