author | harlekin <harlekin> | 2002-08-05 16:43:59 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-05 16:43:59 (UTC) |
commit | af5168ac637f2f5b871cc73a69151dd3d829fec0 (patch) (unidiff) | |
tree | 2cc8dad511ee01709a6c19699206b6ad20184a76 /noncore/multimedia | |
parent | c4a390e38fe72eeafa0620fc1f8299f561958d21 (diff) | |
download | opie-af5168ac637f2f5b871cc73a69151dd3d829fec0.zip opie-af5168ac637f2f5b871cc73a69151dd3d829fec0.tar.gz opie-af5168ac637f2f5b871cc73a69151dd3d829fec0.tar.bz2 |
seeking is working now
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 23f4329..0e9e7ea 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -274,7 +274,7 @@ void AudioWidget::setView( char view ) { | |||
274 | // } else { | 274 | // } else { |
275 | // this stops the slider from being moved, thus | 275 | // this stops the slider from being moved, thus |
276 | // does not stop stream when it reaches the end | 276 | // does not stop stream when it reaches the end |
277 | slider.show(); | 277 | // slider.show(); |
278 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 278 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
279 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 279 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
280 | // } | 280 | // } |
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 | ||
60 | void XineControl::play( const QString& fileName ) { | 59 | void 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 | ||
112 | long XineControl::position() { | 112 | long 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 | ||
128 | void XineControl::seekTo( long second ) { | 128 | void XineControl::seekTo( long second ) { |
129 | // libXine-> | 129 | qDebug("seek triggered!!"); |
130 | libXine->play( m_fileName , 0, (int)second ); | ||
130 | } | 131 | } |
131 | 132 | ||
132 | 133 | ||
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index 4a61f32..c7aefd4 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h | |||
@@ -63,7 +63,7 @@ private: | |||
63 | MediaDetect mdetect; | 63 | MediaDetect mdetect; |
64 | long m_currentTime; | 64 | long m_currentTime; |
65 | long m_position; | 65 | long m_position; |
66 | 66 | QString m_fileName; | |
67 | signals: | 67 | signals: |
68 | void positionChanged( long ); | 68 | void positionChanged( long ); |
69 | 69 | ||