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
@@ -110,48 +110,49 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
 void Lib::run()
 {
     odebug << "Lib::run() started" << oendl;
     initialize();
     m_initialized = true;
     odebug << "Lib::run() finished" << oendl;
 }
 
 void Lib::initialize()
 {
     m_duringInitialization = true;
     m_xine =  xine_new( );
 
     QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
     xine_config_load( m_xine, QFile::encodeName( configPath ) );
 
     xine_init( m_xine );
 
     // allocate oss for sound
     // and fb for framebuffer
     m_audioOutput = xine_open_audio_driver( m_xine,  "oss", NULL );
     m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this );
 
     m_stream = xine_stream_new (m_xine,  m_audioOutput,  m_videoOutput );
+    xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
 
     if (m_wid != 0 )
         setWidget( m_wid );
 
 
     m_queue = xine_event_new_queue (m_stream);
     xine_event_create_listener_thread (m_queue, xine_event_handler, this);
 
     ::null_preload_decoders( m_stream );
 
     m_duringInitialization = false;
 }
 
 Lib::~Lib() {
     assert( isRunning() == false );
     assert( m_initialized );
 
 //    free( m_config );
 
     xine_close( m_stream );
     xine_event_dispose_queue( m_queue );
     xine_dispose( m_stream );
     xine_exit( m_xine );
 
@@ -181,54 +182,62 @@ int Lib::minorVersion() {
      return minor;
 }
 
 int Lib::subVersion() {
      int major, minor, sub;
      xine_get_version ( &major, &minor, &sub );
      return sub;
 }
 
 int Lib::play( const QString& fileName, int startPos, int start_time ) {
     assert( m_initialized );
 
     QString str = fileName.stripWhiteSpace();
 
 
     if ( !xine_open( m_stream, str.utf8().data() ) ) {
          return 0;
     }
     return xine_play( m_stream, startPos, start_time);
 }
 
 void Lib::stop() {
     assert( m_initialized );
     xine_stop( m_stream );
+    xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
 }
 
 void Lib::pause( bool toggle ) {
     assert( m_initialized );
 
-    xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL );
+    if ( toggle ) {
+        xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
+        xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
+    }
+    
+    else {
+        xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL );
+    }
 }
 
 int Lib::speed() const {
     assert( m_initialized );
 
     return  xine_get_param ( m_stream, XINE_PARAM_SPEED );
 }
 
 void Lib::setSpeed( int speed ) {
     assert( m_initialized );
 
     xine_set_param ( m_stream, XINE_PARAM_SPEED, speed );
 }
 
 int Lib::status() const {
     assert( m_initialized );
 
     return xine_get_status( m_stream );
 }
 
 int Lib::currentPosition() const {
     assert( m_initialized );
 
     int pos, time, length;
@@ -261,49 +270,59 @@ int Lib::length() const {
         if (iRetVal)
            {/* if the function didn't return 0, then pos, time and length are valid.*/
            return length/1000;
            }
         /*don't poll too much*/
         usleep(100000);
         iTestLoop++;
         }
       while ( iTestLoop < 10 ); /* if after 1s, we still don't have any
 valid stream, then return -1 (this value could be used to make the stream
 unseekable, but it should never occur!! Mr. Murphy ? :) ) */
 
       return -1;
 }
 
 bool Lib::isSeekable() const {
     assert( m_initialized );
 
     return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE );
 }
 
 void Lib::seekTo( int time ) {
     assert( m_initialized );
 
-    xine_play( m_stream, 0, time*1000 );
+    odebug << "Seeking to second " << time << oendl;
+    //Keep it paused if it was in that state
+    if ( xine_get_param( m_stream, XINE_PARAM_SPEED ) ) {
+        xine_play( m_stream, 0, time*1000 );
+    }
+
+    else {
+        xine_play( m_stream, 0, time*1000 );
+        xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
+    }
+        
 }
 
 
 Frame Lib::currentFrame() const {
     assert( m_initialized );
 
     Frame frame;
     return frame;
 };
 
 QString Lib::metaInfo( int number) const {
     assert( m_initialized );
 
     return xine_get_meta_info( m_stream, number );
 }
 
 int Lib::error() const {
     assert( m_initialized );
 
     return xine_get_error( m_stream );
 };
 
 void Lib::ensureInitialized()
 {