Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
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 | |||
@@ -148,14 +148,12 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par | |||
148 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), | 148 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), |
149 | this, SLOT( playIt( QListViewItem *) ) ); | 149 | this, SLOT( playIt( QListViewItem *) ) ); |
150 | connect ( gammaSlider, SIGNAL( valueChanged( int ) ), | 150 | connect ( gammaSlider, SIGNAL( valueChanged( int ) ), |
151 | &mediaPlayerState, SLOT( setVideoGamma( int ) ) ); | 151 | &mediaPlayerState, SLOT( setVideoGamma( int ) ) ); |
152 | 152 | ||
153 | // see which skins are installed | 153 | // see which skins are installed |
154 | videoScan=false; | ||
155 | audioScan=false; | ||
156 | audioPopulated=false; | 154 | audioPopulated=false; |
157 | videoPopulated=false; | 155 | videoPopulated=false; |
158 | populateSkinsMenu(); | 156 | populateSkinsMenu(); |
159 | initializeStates(); | 157 | initializeStates(); |
160 | 158 | ||
161 | cfg.setGroup("PlayList"); | 159 | cfg.setGroup("PlayList"); |
@@ -251,13 +249,13 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi | |||
251 | 249 | ||
252 | void PlayListWidget::addAllToList() { | 250 | void PlayListWidget::addAllToList() { |
253 | 251 | ||
254 | // QTime t; | 252 | // QTime t; |
255 | // t.start(); | 253 | // t.start(); |
256 | 254 | ||
257 | if(!audioScan) { | 255 | if(!audioView->scannedFiles()) { |
258 | if(audioView->childCount() < 1) | 256 | if(audioView->childCount() < 1) |
259 | populateAudioView(); | 257 | populateAudioView(); |
260 | } | 258 | } |
261 | 259 | ||
262 | QListViewItemIterator audioIt( audioView ); | 260 | QListViewItemIterator audioIt( audioView ); |
263 | DocLnk lnk; | 261 | DocLnk lnk; |
@@ -267,13 +265,13 @@ void PlayListWidget::addAllToList() { | |||
267 | filename = audioIt.current()->text(3); | 265 | filename = audioIt.current()->text(3); |
268 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 266 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
269 | lnk.setFile( filename ); //sets file name | 267 | lnk.setFile( filename ); //sets file name |
270 | d->selectedFiles->addToSelection( lnk); | 268 | d->selectedFiles->addToSelection( lnk); |
271 | } | 269 | } |
272 | 270 | ||
273 | if(!videoScan) { | 271 | if(!videoView->scannedFiles()) { |
274 | if(videoView->childCount() < 1) | 272 | if(videoView->childCount() < 1) |
275 | populateVideoView(); | 273 | populateVideoView(); |
276 | } | 274 | } |
277 | 275 | ||
278 | QListViewItemIterator videoIt( videoView ); | 276 | QListViewItemIterator videoIt( videoView ); |
279 | for ( ; videoIt.current(); ++videoIt ) { | 277 | for ( ; videoIt.current(); ++videoIt ) { |
@@ -311,13 +309,13 @@ void PlayListWidget::addAllToList() { | |||
311 | d->selectedFiles->first(); | 309 | d->selectedFiles->first(); |
312 | } | 310 | } |
313 | 311 | ||
314 | 312 | ||
315 | void PlayListWidget::addAllMusicToList() { | 313 | void PlayListWidget::addAllMusicToList() { |
316 | 314 | ||
317 | if(!audioScan) { | 315 | if(!audioView->scannedFiles()) { |
318 | if(audioView->childCount() < 1) | 316 | if(audioView->childCount() < 1) |
319 | populateAudioView(); | 317 | populateAudioView(); |
320 | } | 318 | } |
321 | 319 | ||
322 | QListViewItemIterator audioIt( audioView ); | 320 | QListViewItemIterator audioIt( audioView ); |
323 | DocLnk lnk; | 321 | DocLnk lnk; |
@@ -344,13 +342,13 @@ void PlayListWidget::addAllMusicToList() { | |||
344 | d->selectedFiles->first(); | 342 | d->selectedFiles->first(); |
345 | } | 343 | } |
346 | 344 | ||
347 | 345 | ||
348 | void PlayListWidget::addAllVideoToList() { | 346 | void PlayListWidget::addAllVideoToList() { |
349 | 347 | ||
350 | if(!videoScan) { | 348 | if(!videoView->scannedFiles()) { |
351 | if(videoView->childCount() < 1) | 349 | if(videoView->childCount() < 1) |
352 | populateVideoView(); | 350 | populateVideoView(); |
353 | } | 351 | } |
354 | 352 | ||
355 | QListViewItemIterator videoIt( videoView ); | 353 | QListViewItemIterator videoIt( videoView ); |
356 | DocLnk lnk; | 354 | DocLnk lnk; |
@@ -635,27 +633,27 @@ void PlayListWidget::playSelected() { | |||
635 | btnPlay( TRUE); | 633 | btnPlay( TRUE); |
636 | } | 634 | } |
637 | 635 | ||
638 | 636 | ||
639 | void PlayListWidget::scanForAudio() { | 637 | void PlayListWidget::scanForAudio() { |
640 | audioView->scanFiles(); | 638 | audioView->scanFiles(); |
641 | audioScan = true; | 639 | audioView->scannedFiles() = true; |
642 | populateAudioView(); | 640 | populateAudioView(); |
643 | } | 641 | } |
644 | 642 | ||
645 | void PlayListWidget::scanForVideo() { | 643 | void PlayListWidget::scanForVideo() { |
646 | videoView->scanFiles(); | 644 | videoView->scanFiles(); |
647 | videoScan = true; | 645 | videoView->scannedFiles() = true; |
648 | populateVideoView(); | 646 | populateVideoView(); |
649 | } | 647 | } |
650 | 648 | ||
651 | void PlayListWidget::populateAudioView() { | 649 | void PlayListWidget::populateAudioView() { |
652 | audioView->clear(); | 650 | audioView->clear(); |
653 | StorageInfo storageInfo; | 651 | StorageInfo storageInfo; |
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(); |
657 | } | 655 | } |
658 | 656 | ||
659 | QListIterator<DocLnk> dit( audioView->files().children() ); | 657 | QListIterator<DocLnk> dit( audioView->files().children() ); |
660 | // QListIterator<FileSystem> it ( fs ); | 658 | // QListIterator<FileSystem> it ( fs ); |
661 | audioView->clear(); | 659 | audioView->clear(); |
@@ -692,13 +690,13 @@ void PlayListWidget::populateAudioView() { | |||
692 | 690 | ||
693 | void PlayListWidget::populateVideoView() { | 691 | void PlayListWidget::populateVideoView() { |
694 | videoView->clear(); | 692 | videoView->clear(); |
695 | StorageInfo storageInfo; | 693 | StorageInfo storageInfo; |
696 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); | 694 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); |
697 | 695 | ||
698 | if(!videoScan ) { | 696 | if(!videoView->scannedFiles()) { |
699 | scanForVideo(); | 697 | scanForVideo(); |
700 | } | 698 | } |
701 | 699 | ||
702 | QListIterator<DocLnk> Vdit( videoView->files().children() ); | 700 | QListIterator<DocLnk> Vdit( videoView->files().children() ); |
703 | // QListIterator<FileSystem> it ( fs ); | 701 | // QListIterator<FileSystem> it ( fs ); |
704 | videoView->clear(); | 702 | videoView->clear(); |