- moving videoScan and audioScan into PlayListFileView

4 files changed, 14 insertions, 12 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp
index 2726296..1e2ef89 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.cpp
+++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp
@@ -5,5 +5,5 @@
 
 PlayListFileView::PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name )
-    : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern )
+    : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ), m_scannedFiles( false )
 {
     addColumn( tr( "Title" ), 140);
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h
index 08db929..4e17966 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.h
+++ b/noncore/multimedia/opieplayer2/playlistfileview.h
@@ -13,5 +13,8 @@ public:
     virtual ~PlayListFileView();
 
+    // both temporarily accessible that way until the caller code has
+    // been migrated into this class
     DocLnkSet &files() { return m_files; }
+    bool &scannedFiles() { return m_scannedFiles; }
 
 public slots:
@@ -21,4 +24,5 @@ private:
     QString m_mimeTypePattern;
     DocLnkSet m_files;
+    bool m_scannedFiles;
 };
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 93e7919..12b8a71 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -152,6 +152,4 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
 
     // see which skins are installed
-    videoScan=false;
-    audioScan=false;
     audioPopulated=false;
     videoPopulated=false;
@@ -255,5 +253,5 @@ void PlayListWidget::addAllToList() {
 //   t.start();
 
-  if(!audioScan) {
+  if(!audioView->scannedFiles()) {
     if(audioView->childCount() < 1)
       populateAudioView();
@@ -271,5 +269,5 @@ void PlayListWidget::addAllToList() {
   }      
 
-  if(!videoScan) {
+  if(!videoView->scannedFiles()) {
     if(videoView->childCount() < 1)
       populateVideoView();
@@ -315,5 +313,5 @@ void PlayListWidget::addAllToList() {
 void PlayListWidget::addAllMusicToList() {
 
-  if(!audioScan) {
+  if(!audioView->scannedFiles()) {
     if(audioView->childCount() < 1)
       populateAudioView();
@@ -348,5 +346,5 @@ void PlayListWidget::addAllMusicToList() {
 void PlayListWidget::addAllVideoToList() {
 
-  if(!videoScan) {
+  if(!videoView->scannedFiles()) {
     if(videoView->childCount() < 1)
       populateVideoView();
@@ -639,5 +637,5 @@ void PlayListWidget::playSelected() {
 void PlayListWidget::scanForAudio() {
   audioView->scanFiles();
-  audioScan = true;
+  audioView->scannedFiles() = true;
   populateAudioView();
 }
@@ -645,5 +643,5 @@ void PlayListWidget::scanForAudio() {
 void PlayListWidget::scanForVideo() {
   videoView->scanFiles();
-  videoScan = true;
+  videoView->scannedFiles() = true;
   populateVideoView();  
 }
@@ -653,5 +651,5 @@ void PlayListWidget::populateAudioView() {
     StorageInfo storageInfo;
     //    const QList<FileSystem> &fs = storageInfo.fileSystems();
-    if(!audioScan) {
+    if(!audioView->scannedFiles()) {
         scanForAudio();
     }
@@ -696,5 +694,5 @@ void PlayListWidget::populateVideoView() {
     //    const QList<FileSystem> &fs = storageInfo.fileSystems();
 
-    if(!videoScan ) {
+    if(!videoView->scannedFiles()) {
         scanForVideo();
     }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index e81ef3c..58efd47 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -95,5 +95,5 @@ signals:
 private:
     int defaultSkinIndex;
-    bool audioScan, videoScan, audioPopulated, videoPopulated;
+    bool audioPopulated, videoPopulated;
     void readm3u(const QString &);
     void readPls(const QString &);