Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
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 | |||
@@ -6,3 +6,3 @@ | |||
6 | PlayListFileView::PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name ) | 6 | PlayListFileView::PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name ) |
7 | : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ) | 7 | : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ), m_scannedFiles( false ) |
8 | { | 8 | { |
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 | |||
@@ -14,3 +14,6 @@ public: | |||
14 | 14 | ||
15 | // both temporarily accessible that way until the caller code has | ||
16 | // been migrated into this class | ||
15 | DocLnkSet &files() { return m_files; } | 17 | DocLnkSet &files() { return m_files; } |
18 | bool &scannedFiles() { return m_scannedFiles; } | ||
16 | 19 | ||
@@ -22,2 +25,3 @@ private: | |||
22 | DocLnkSet m_files; | 25 | DocLnkSet m_files; |
26 | bool m_scannedFiles; | ||
23 | }; | 27 | }; |
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 | |||
@@ -153,4 +153,2 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par | |||
153 | // see which skins are installed | 153 | // see which skins are installed |
154 | videoScan=false; | ||
155 | audioScan=false; | ||
156 | audioPopulated=false; | 154 | audioPopulated=false; |
@@ -256,3 +254,3 @@ void PlayListWidget::addAllToList() { | |||
256 | 254 | ||
257 | if(!audioScan) { | 255 | if(!audioView->scannedFiles()) { |
258 | if(audioView->childCount() < 1) | 256 | if(audioView->childCount() < 1) |
@@ -272,3 +270,3 @@ void PlayListWidget::addAllToList() { | |||
272 | 270 | ||
273 | if(!videoScan) { | 271 | if(!videoView->scannedFiles()) { |
274 | if(videoView->childCount() < 1) | 272 | if(videoView->childCount() < 1) |
@@ -316,3 +314,3 @@ void PlayListWidget::addAllMusicToList() { | |||
316 | 314 | ||
317 | if(!audioScan) { | 315 | if(!audioView->scannedFiles()) { |
318 | if(audioView->childCount() < 1) | 316 | if(audioView->childCount() < 1) |
@@ -349,3 +347,3 @@ void PlayListWidget::addAllVideoToList() { | |||
349 | 347 | ||
350 | if(!videoScan) { | 348 | if(!videoView->scannedFiles()) { |
351 | if(videoView->childCount() < 1) | 349 | if(videoView->childCount() < 1) |
@@ -640,3 +638,3 @@ void PlayListWidget::scanForAudio() { | |||
640 | audioView->scanFiles(); | 638 | audioView->scanFiles(); |
641 | audioScan = true; | 639 | audioView->scannedFiles() = true; |
642 | populateAudioView(); | 640 | populateAudioView(); |
@@ -646,3 +644,3 @@ void PlayListWidget::scanForVideo() { | |||
646 | videoView->scanFiles(); | 644 | videoView->scanFiles(); |
647 | videoScan = true; | 645 | videoView->scannedFiles() = true; |
648 | populateVideoView(); | 646 | populateVideoView(); |
@@ -654,3 +652,3 @@ void PlayListWidget::populateAudioView() { | |||
654 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); | 652 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); |
655 | if(!audioScan) { | 653 | if(!audioView->scannedFiles()) { |
656 | scanForAudio(); | 654 | scanForAudio(); |
@@ -697,3 +695,3 @@ void PlayListWidget::populateVideoView() { | |||
697 | 695 | ||
698 | if(!videoScan ) { | 696 | if(!videoView->scannedFiles()) { |
699 | scanForVideo(); | 697 | 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 | |||
@@ -96,3 +96,3 @@ private: | |||
96 | int defaultSkinIndex; | 96 | int defaultSkinIndex; |
97 | bool audioScan, videoScan, audioPopulated, videoPopulated; | 97 | bool audioPopulated, videoPopulated; |
98 | void readm3u(const QString &); | 98 | void readm3u(const QString &); |