stop now working as supposed

4 files changed, 8 insertions, 7 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 3b20873..d554141 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -170,8 +170,9 @@ int Lib::play( const QString& fileName,
     return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(),
                startPos, start_time);
 }
 void Lib::stop() {
+    qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
     xine_stop(m_xine );
 }
 void Lib::pause(){
     xine_set_speed( m_xine, SPEED_PAUSE );
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 51fbb8b..93819f2 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -47,9 +47,9 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     connect( videoUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( videoUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( videoUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( videoUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
-    
+
     volControl = new VolumeControl;
 
 }
 
@@ -70,9 +70,9 @@ void MediaPlayer::play() {
 }
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
-        mediaPlayerState->setPaused( FALSE );
+        //mediaPlayerState->setPaused( TRUE );
         return;
     }
 
      if ( mediaPlayerState->paused() ) {
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index c210ffb..77e2095 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -684,9 +684,9 @@ void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
 }
 
 void PlayListWidget::playIt( QListViewItem *it) {
-    if(it==NULL) return;
+    // if(it==NULL) return;
     qDebug("playIt");
     mediaPlayerState->setPlaying(FALSE);
     mediaPlayerState->setPlaying(TRUE);
     d->selectedFiles->unSelect();
@@ -1232,15 +1232,15 @@ void PlayListWidget::pmViewActivated(int index) {
 qDebug("%d", index);
 switch(index) {
   case -16:
   {
-     
+
       mediaPlayerState->toggleFullscreen();
       bool b=mediaPlayerState->fullscreen();
       pmView->setItemChecked( index,b);
       Config cfg( "OpiePlayer" );
       cfg.writeEntry("FullScreen", b);
-        
+
   }
   break;
 };
 }
@@ -1267,9 +1267,9 @@ void PlayListWidget::populateSkinsMenu() {
         if( skinName == "default")
             defaultSkinIndex = item;
         if( skinName == skin)
             skinsMenu->setItemChecked( item, TRUE);
-                
+
         ++it;
     }
 }
 
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 17112a2..8fd2743 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -115,9 +115,9 @@ void XineControl::nextMedia() {
 void XineControl::stop( bool isSet ) {
     if ( !isSet) {
         libXine->stop( );
         mediaPlayerState->setList();
-        //mediaPlayerState->setPlaying( false );
+        //        mediaPlayerState->setPlaying( false );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
         if ( disabledSuspendScreenSaver ) {
             disabledSuspendScreenSaver = FALSE;