- added a currentTab method that returns an enum containing the current tab

  type in a verbose manner (AudioFiles, VideoFiles, CurrentPlayList, etc.),
  as a future replacment for whichList() which just returns an integer

2 files changed, 15 insertions, 0 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index d1506db..9918eeb 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -49,12 +49,13 @@
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 #include "om3u.h"
 
 //only needed for the random play
 #include <stdlib.h>
+#include <assert.h>
 
 #include "audiowidget.h"
 #include "videowidget.h"
 
 extern MediaPlayerState *mediaPlayerState;
 // extern AudioWidget *audioUI;
@@ -1142,12 +1143,23 @@ void PlayListWidget::skinsMenuActivated( int item ) {
 } 
 
 int PlayListWidget::whichList() {
     return tabWidget->currentPageIndex();
 }
 
+PlayListWidget::TabType PlayListWidget::currentTab() const
+{
+    static const TabType indexToTabType[ NumTabTypes ] =
+    { CurrentPlaylist, AudioFiles, VideoFiles, PlayLists };
+
+    int index = tabWidget->currentPageIndex();
+    assert( index < NumTabTypes && index >= 0 );
+
+    return indexToTabType[ index ];
+}
+
 QString PlayListWidget::currentFileListPathName() {
     switch (whichList()) {
       case 1:
           return audioView->currentItem()->text(3);
           break;
       case 2:
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index b2c389e..05d53a4 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -52,24 +52,27 @@ class QPoint;
 class QAction;
 class QLabel;
 
 class PlayListWidget : public PlayListWidgetGui {
     Q_OBJECT
 public:
+    enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists, NumTabTypes = 4 };
+
     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();
     void useSelectedDocument();
     int selected;
     int whichList();
+    TabType currentTab() const;
 
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();