summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp23
1 files changed, 21 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index f1b9773..6ed4cea 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -131,6 +131,7 @@ void Lib::initialize()
131 m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this ); 131 m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this );
132 132
133 m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); 133 m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput );
134 xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
134 135
135 if (m_wid != 0 ) 136 if (m_wid != 0 )
136 setWidget( m_wid ); 137 setWidget( m_wid );
@@ -202,12 +203,20 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) {
202void Lib::stop() { 203void Lib::stop() {
203 assert( m_initialized ); 204 assert( m_initialized );
204 xine_stop( m_stream ); 205 xine_stop( m_stream );
206 xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
205} 207}
206 208
207void Lib::pause( bool toggle ) { 209void Lib::pause( bool toggle ) {
208 assert( m_initialized ); 210 assert( m_initialized );
209 211
210 xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL ); 212 if ( toggle ) {
213 xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
214 xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
215 }
216
217 else {
218 xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL );
219 }
211} 220}
212 221
213int Lib::speed() const { 222int Lib::speed() const {
@@ -282,7 +291,17 @@ bool Lib::isSeekable() const {
282void Lib::seekTo( int time ) { 291void Lib::seekTo( int time ) {
283 assert( m_initialized ); 292 assert( m_initialized );
284 293
285 xine_play( m_stream, 0, time*1000 ); 294 odebug << "Seeking to second " << time << oendl;
295 //Keep it paused if it was in that state
296 if ( xine_get_param( m_stream, XINE_PARAM_SPEED ) ) {
297 xine_play( m_stream, 0, time*1000 );
298 }
299
300 else {
301 xine_play( m_stream, 0, time*1000 );
302 xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
303 }
304
286} 305}
287 306
288 307