- simplified MediaPlayer::setPlaying, moving more switch() like code into

  playlistwidget

4 files changed, 33 insertions, 24 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 6a38adc..74ab2e3 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -12,49 +12,49 @@
 
 #include "mediaplayer.h"
 #include "playlistwidget.h"
 #include "audiowidget.h"
 #include "videowidget.h"
 #include "volumecontrol.h"
 
 #include "mediaplayerstate.h"
 
 // for setBacklight()
 #include <linux/fb.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
 
 extern AudioWidget *audioUI;
 extern VideoWidget *videoUI;
 extern PlayListWidget *playList;
 extern MediaPlayerState *mediaPlayerState;
 
 
 #define FBIOBLANK             0x4611
 
 MediaPlayer::MediaPlayer( QObject *parent, const char *name )
-    : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
+    : QObject( parent, name ), volumeDirection( 0 ) {
 
     fd=-1;fl=-1;
     playList->setCaption( tr( "OpiePlayer: Initializating" ) );
 
     qApp->processEvents();
     //    QPEApplication::grabKeyboard(); // EVIL
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
 
     connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
 
     connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
     connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
     connect( mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) );
 
     connect( audioUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( audioUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( audioUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( audioUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
     connect( videoUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( videoUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( videoUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
@@ -74,83 +74,70 @@ MediaPlayer::~MediaPlayer() {
 }
 
 void MediaPlayer::pauseCheck( bool b ) {
      if ( b && !mediaPlayerState->isPlaying() ) {
          mediaPlayerState->setPaused( FALSE );
      }
 }
 
 void MediaPlayer::play() {
     mediaPlayerState->setPlaying( FALSE );
     mediaPlayerState->setPlaying( TRUE );
 }
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
         return;
     }
 
     if ( mediaPlayerState->isPaused() ) {
         mediaPlayerState->setPaused( FALSE );
         return;
     }
 
     QString tickerText, time, fileName;
-    if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //check for filelist
-        const DocLnk *playListCurrent = playList->current();
-        if ( playListCurrent != NULL ) {
-            currentFile = playListCurrent;
-        }
-        xineControl->play( currentFile->file() );
-        fileName = currentFile->name();
-        long seconds =  mediaPlayerState->length();//
-        time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
-        //qDebug(time);
-
-    } else {
+    if ( playList->currentTab() != PlayListWidget::CurrentPlayList ) {
         //if playing in file list.. play in a different way
         // random and looping settings enabled causes problems here,
         // since there is no selected file in the playlist, but a selected file in the file list,
         // so we remember and shutoff
         l = mediaPlayerState->isLooping();
         if(l) {
             mediaPlayerState->setLooping( false );
         }
         r = mediaPlayerState->isShuffled();
         mediaPlayerState->setShuffled( false );
+    }
+
+    PlayListWidget::Entry playListEntry = playList->currentEntry();
+    fileName = playListEntry.name;
+    xineControl->play( playListEntry.file );
 
-        fileName = playList->currentFileListPathName();
-        xineControl->play( fileName );
         long seconds =  mediaPlayerState->length();
         time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
-        //qDebug(time);
-        if( fileName.left(4) != "http" ) {
-            fileName = QFileInfo( fileName ).baseName();
-        }
-
-    }
 
     if( fileName.left(4) == "http" ) {
+        fileName = QFileInfo( fileName ).baseName();
        if ( xineControl->getMetaInfo().isEmpty() ) {
            tickerText = tr( " File: " ) + fileName;
        } else {
            tickerText = xineControl->getMetaInfo();
        }
     } else {
         if ( xineControl->getMetaInfo().isEmpty() ) {
             tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + "  ";
         } else {
             tickerText = xineControl->getMetaInfo() + " Length: " + time + "  ";
         }
     }
     audioUI->setTickerText( tickerText );
 }
 
 
 void MediaPlayer::prev() {
     if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //if using the playlist
         if ( playList->prev() ) {
             play();
         } else if ( mediaPlayerState->isLooping() ) {
             if ( playList->last() ) {
                 play();
             }
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 002311a..1e34c88 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -47,32 +47,31 @@ class VolumeControl;
 class MediaPlayer : public QObject {
     Q_OBJECT
 public:
     MediaPlayer( QObject *parent, const char *name );
     ~MediaPlayer();
 private slots:
     void setPlaying( bool );
     void pauseCheck( bool );
     void play();
     void next();
     void prev();
     void startIncreasingVolume();
     void startDecreasingVolume();
     void stopChangingVolume();
     void cleanUp();
     void blank( bool );
 
 protected:
     void timerEvent( QTimerEvent *e );
     void keyReleaseEvent( QKeyEvent *e);
 private:
     bool isBlanked, l, r;
     int fd, fl;
     int     volumeDirection;
-    const DocLnk  *currentFile;
     XineControl *xineControl;
     VolumeControl *volControl;
 };
 
 
 #endif // MEDIA_PLAYER_H
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index fd256b7..ce73252 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -403,49 +403,49 @@ void PlayListWidget::setDocument( const QString& fileref ) {
         readm3u( fileref );
     } else if( DocLnk( fileref).file().find( "m3u", 0, TRUE) != -1 ) {
         readm3u( DocLnk( fileref).file() );
     } else if( fileref.find( "pls", 0, TRUE) != -1 ) { //is pls
         readPls( fileref );
     } else if( DocLnk( fileref).file().find( "pls", 0, TRUE) != -1 ) {
         readPls( DocLnk( fileref).file() );
     } else {
         clearList();
         addToSelection( DocLnk( fileref ) );
         writeCurrentM3u();          
         
         d->setDocumentUsed = TRUE;
         mediaPlayerState->setPlaying( FALSE );
         mediaPlayerState->setPlaying( TRUE );
     }
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
-const DocLnk *PlayListWidget::current() { // this is fugly
+const DocLnk *PlayListWidget::current() const { // this is fugly
     assert( currentTab() == CurrentPlayList );
 
 //      qDebug("playlist");
     if ( mediaPlayerState->isUsingPlaylist() ) {
         return d->selectedFiles->current();
     } else if ( d->setDocumentUsed && d->current ) {
         return d->current;
     } else {
           return &(d->files->selectedDocument());
     }
 }
 
 
 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++ ) {
                 if ( !d->selectedFiles->next() )
                     d->selectedFiles->first();
             }
             if ( cur == current() )
                 if ( !d->selectedFiles->next() ) {
@@ -1120,27 +1120,37 @@ void PlayListWidget::populateSkinsMenu() {
 void PlayListWidget::skinsMenuActivated( int item ) {
     for(unsigned int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
         skinsMenu->setItemChecked( i, FALSE );
     }
     skinsMenu->setItemChecked( item, TRUE );
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("Options");
     cfg.writeEntry("Skin", skinsMenu->text( item ) );
     QMessageBox::warning( this, tr( "OpiePlayer" ),
                                tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) );
 } 
 
 PlayListWidget::TabType PlayListWidget::currentTab() const
 {
     static const TabType indexToTabType[ TabTypeCount ] =
     { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
 
     int index = tabWidget->currentPageIndex();
     assert( index < TabTypeCount && index >= 0 );
 
     return indexToTabType[ index ];
 }
 
+PlayListWidget::Entry PlayListWidget::currentEntry() const
+{
+    if ( currentTab() == CurrentPlayList ) {
+        const DocLnk *lnk = current();
+        return Entry( lnk->name(), lnk->file() );
+    }
+
+    return Entry( currentFileListPathName() );
+}
+
 QString PlayListWidget::currentFileListPathName() const {
     return currentFileListView()->currentItem()->text( 3 );
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 2e2ff89..511a192 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -37,61 +37,74 @@
 #include <qmainwindow.h>
 #include <qpe/applnk.h>
 #include <qtabwidget.h>
 #include <qpe/fileselector.h>
 #include <qpushbutton.h>
 #include <qpopupmenu.h>
 
 #include "playlistwidgetgui.h"
 
 
 //class PlayListWidgetPrivate;
 class Config;
 class QListViewItem;
 class QListView;
 class QPoint;
 class QAction;
 class QLabel;
 
 class PlayListWidget : public PlayListWidgetGui {
     Q_OBJECT
 public:
     enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
     enum { TabTypeCount = 4 };
 
+    struct Entry
+    {
+        Entry( const QString &_name, const QString &_fileName )
+            : name( _name ), file( _fileName ) {}
+        Entry( const QString &_fileName )
+            : name( _fileName ), file( _fileName ) {}
+
+        QString name;
+        QString file;
+    };
+
     PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~PlayListWidget();
     DocLnkSet files;
     DocLnkSet vFiles;
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef, currentPlayList;
     // retrieve the current playlist entry (media file link)
-    const DocLnk *current();
+    const DocLnk *current() const;
     void useSelectedDocument();
     int selected;
     TabType currentTab() const;
 
+    Entry currentEntry() const;
+
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();
     void writeDefaultPlaylist( );
     QString currentFileListPathName() const;
 protected:
     void keyReleaseEvent( QKeyEvent *e);
 
 private:
     int defaultSkinIndex;
     bool audioScan, videoScan, audioPopulated, videoPopulated;
     void readm3u(const QString &);
     void readPls(const QString &);
     void initializeStates();
     void populateAudioView();
     void populateVideoView();
 
     QListView *currentFileListView() const;
 
     bool inFileListMode() const;
 
 private slots: