3 files changed, 0 insertions, 26 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index 43040c2..586870c 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -65,11 +65,9 @@ void MediaPlayerState::readConfig( Config& cfg ) {
     fullscreen = cfg.readBoolEntry( "FullScreen" );
     scaled = cfg.readBoolEntry( "Scaling" );
     looping = cfg.readBoolEntry( "Looping" );
     shuffled = cfg.readBoolEntry( "Shuffle" );
-    usePlaylist = cfg.readBoolEntry( "UsePlayList" );
     videoGamma = cfg.readNumEntry( "VideoGamma" );
-    usePlaylist = TRUE;
     playing = FALSE;
     streaming = FALSE;
     paused = FALSE;
     curPosition = 0;
@@ -83,9 +81,8 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
     cfg.writeEntry( "FullScreen", fullscreen );
     cfg.writeEntry( "Scaling", scaled );
     cfg.writeEntry( "Looping", looping );
     cfg.writeEntry( "Shuffle", shuffled );
-    cfg.writeEntry( "UsePlayList", usePlaylist );
     cfg.writeEntry( "VideoGamma",  videoGamma );
 }
 
 // slots
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index 7a80ad8..fc4e6cb 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -55,9 +55,8 @@ public:
     bool isFullscreen() const { return fullscreen; }
     bool isScaled() const { return scaled; }
     bool isLooping() const { return looping; }
     bool isShuffled() const { return shuffled; }
-    bool isUsingPlaylist() const { return usePlaylist; }
     bool isPaused() const { return paused; }
     bool isPlaying() const { return playing; }
     bool isStopped() const { return stopped; }
     long position() const { return curPosition; }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 5b277cc..f53def6 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -204,18 +204,14 @@ void PlayListWidget::writeDefaultPlaylist() {
 }
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
     d->setDocumentUsed = FALSE;
-    if ( mediaPlayerState->isUsingPlaylist() ) {
         if( QFileInfo( lnk.file() ).exists() ||
             lnk.file().left(4) == "http" ) {
             d->selectedFiles->addToSelection( lnk );
         }
 //          writeCurrentM3u();          
     }
-    else
-        mediaPlayerState->setPlaying( TRUE );
-}
 
 
 void PlayListWidget::clearList() {
     while ( first() ) {
@@ -421,18 +417,13 @@ void PlayListWidget::useSelectedDocument() {
 
 const DocLnk *PlayListWidget::current() const { // this is fugly
     assert( currentTab() == CurrentPlayList );
 
-//      qDebug("playlist");
-    if ( mediaPlayerState->isUsingPlaylist() )
         return d->selectedFiles->current();
-
-    assert( false );
 }
 
 
 bool PlayListWidget::prev() {
-    if ( mediaPlayerState->isUsingPlaylist() ) {
         if ( mediaPlayerState->isShuffled() ) {
             const DocLnk *cur = current();
             int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
             for ( int i = 0; i < j; i++ ) {
@@ -453,17 +444,13 @@ bool PlayListWidget::prev() {
                 }
             }
             return TRUE;
         }
-    } else {
-        return mediaPlayerState->isLooping();
-  }
 }
 
 
 bool PlayListWidget::next() {
 //qDebug("<<<<<<<<<<<<next()");
- if ( mediaPlayerState->isUsingPlaylist() ) {
         if ( mediaPlayerState->isShuffled() ) {
             return prev();
         } else {
             if ( !d->selectedFiles->next() ) {
@@ -474,27 +461,18 @@ bool PlayListWidget::next() {
                 }
             }
             return TRUE;
         }
-    } else {
-        return mediaPlayerState->isLooping();
-    }
 }
 
 
 bool PlayListWidget::first() {
-    if ( mediaPlayerState->isUsingPlaylist() )
         return d->selectedFiles->first();
-    else
-        return mediaPlayerState->isLooping();
 }
 
 
 bool PlayListWidget::last() {
-    if ( mediaPlayerState->isUsingPlaylist() )
         return d->selectedFiles->last();
-    else
-        return mediaPlayerState->isLooping();
 }
 
 
  void PlayListWidget::saveList() {