Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 460a0bf..eb0606d 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -142,26 +142,24 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par | |||
142 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), | 142 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), |
143 | d->tbPlay, SLOT( setOn( bool ) ) ); | 143 | d->tbPlay, SLOT( setOn( bool ) ) ); |
144 | connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ), | 144 | connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ), |
145 | d->tbLoop, SLOT( setOn( bool ) ) ); | 145 | d->tbLoop, SLOT( setOn( bool ) ) ); |
146 | connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), | 146 | connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), |
147 | d->tbShuffle, SLOT( setOn( bool ) ) ); | 147 | d->tbShuffle, SLOT( setOn( bool ) ) ); |
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 | audioPopulated=false; | ||
155 | videoPopulated=false; | ||
156 | populateSkinsMenu(); | 154 | populateSkinsMenu(); |
157 | initializeStates(); | 155 | initializeStates(); |
158 | 156 | ||
159 | cfg.setGroup("PlayList"); | 157 | cfg.setGroup("PlayList"); |
160 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); | 158 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); |
161 | loadList(DocLnk( currentPlaylist ) ); | 159 | loadList(DocLnk( currentPlaylist ) ); |
162 | } | 160 | } |
163 | 161 | ||
164 | 162 | ||
165 | PlayListWidget::~PlayListWidget() { | 163 | PlayListWidget::~PlayListWidget() { |
166 | delete d; | 164 | delete d; |
167 | } | 165 | } |
@@ -245,41 +243,41 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi | |||
245 | break; | 243 | break; |
246 | } | 244 | } |
247 | } | 245 | } |
248 | 246 | ||
249 | 247 | ||
250 | void PlayListWidget::addAllToList() { | 248 | void PlayListWidget::addAllToList() { |
251 | 249 | ||
252 | // QTime t; | 250 | // QTime t; |
253 | // t.start(); | 251 | // t.start(); |
254 | 252 | ||
255 | if(!audioView->scannedFiles()) { | 253 | if(!audioView->scannedFiles()) { |
256 | if(audioView->childCount() < 1) | 254 | if(audioView->childCount() < 1) |
257 | populateAudioView(); | 255 | audioView->populateView(); |
258 | } | 256 | } |
259 | 257 | ||
260 | QListViewItemIterator audioIt( audioView ); | 258 | QListViewItemIterator audioIt( audioView ); |
261 | DocLnk lnk; | 259 | DocLnk lnk; |
262 | QString filename; | 260 | QString filename; |
263 | // iterate through all items of the listview | 261 | // iterate through all items of the listview |
264 | for ( ; audioIt.current(); ++audioIt ) { | 262 | for ( ; audioIt.current(); ++audioIt ) { |
265 | filename = audioIt.current()->text(3); | 263 | filename = audioIt.current()->text(3); |
266 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 264 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
267 | lnk.setFile( filename ); //sets file name | 265 | lnk.setFile( filename ); //sets file name |
268 | d->selectedFiles->addToSelection( lnk); | 266 | d->selectedFiles->addToSelection( lnk); |
269 | } | 267 | } |
270 | 268 | ||
271 | if(!videoView->scannedFiles()) { | 269 | if(!videoView->scannedFiles()) { |
272 | if(videoView->childCount() < 1) | 270 | if(videoView->childCount() < 1) |
273 | populateVideoView(); | 271 | videoView->populateView(); |
274 | } | 272 | } |
275 | 273 | ||
276 | QListViewItemIterator videoIt( videoView ); | 274 | QListViewItemIterator videoIt( videoView ); |
277 | for ( ; videoIt.current(); ++videoIt ) { | 275 | for ( ; videoIt.current(); ++videoIt ) { |
278 | filename = videoIt.current()->text(3); | 276 | filename = videoIt.current()->text(3); |
279 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 277 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
280 | lnk.setFile( filename ); //sets file name | 278 | lnk.setFile( filename ); //sets file name |
281 | d->selectedFiles->addToSelection( lnk); | 279 | d->selectedFiles->addToSelection( lnk); |
282 | } | 280 | } |
283 | 281 | ||
284 | // d->selectedFiles->addToSelection( ); | 282 | // d->selectedFiles->addToSelection( ); |
285 | // if ( it.current()->isSelected() ) | 283 | // if ( it.current()->isSelected() ) |
@@ -305,25 +303,25 @@ void PlayListWidget::addAllToList() { | |||
305 | 303 | ||
306 | tabWidget->setCurrentPage(0); | 304 | tabWidget->setCurrentPage(0); |
307 | 305 | ||
308 | writeCurrentM3u(); | 306 | writeCurrentM3u(); |
309 | d->selectedFiles->first(); | 307 | d->selectedFiles->first(); |
310 | } | 308 | } |
311 | 309 | ||
312 | 310 | ||
313 | void PlayListWidget::addAllMusicToList() { | 311 | void PlayListWidget::addAllMusicToList() { |
314 | 312 | ||
315 | if(!audioView->scannedFiles()) { | 313 | if(!audioView->scannedFiles()) { |
316 | if(audioView->childCount() < 1) | 314 | if(audioView->childCount() < 1) |
317 | populateAudioView(); | 315 | audioView->populateView(); |
318 | } | 316 | } |
319 | 317 | ||
320 | QListViewItemIterator audioIt( audioView ); | 318 | QListViewItemIterator audioIt( audioView ); |
321 | DocLnk lnk; | 319 | DocLnk lnk; |
322 | QString filename; | 320 | QString filename; |
323 | // iterate through all items of the listview | 321 | // iterate through all items of the listview |
324 | for ( ; audioIt.current(); ++audioIt ) { | 322 | for ( ; audioIt.current(); ++audioIt ) { |
325 | filename = audioIt.current()->text(3); | 323 | filename = audioIt.current()->text(3); |
326 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 324 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
327 | lnk.setFile( filename ); //sets file name | 325 | lnk.setFile( filename ); //sets file name |
328 | d->selectedFiles->addToSelection( lnk); | 326 | d->selectedFiles->addToSelection( lnk); |
329 | } | 327 | } |
@@ -338,25 +336,25 @@ void PlayListWidget::addAllMusicToList() { | |||
338 | } | 336 | } |
339 | */ | 337 | */ |
340 | tabWidget->setCurrentPage(0); | 338 | tabWidget->setCurrentPage(0); |
341 | writeCurrentM3u(); | 339 | writeCurrentM3u(); |
342 | d->selectedFiles->first(); | 340 | d->selectedFiles->first(); |
343 | } | 341 | } |
344 | 342 | ||
345 | 343 | ||
346 | void PlayListWidget::addAllVideoToList() { | 344 | void PlayListWidget::addAllVideoToList() { |
347 | 345 | ||
348 | if(!videoView->scannedFiles()) { | 346 | if(!videoView->scannedFiles()) { |
349 | if(videoView->childCount() < 1) | 347 | if(videoView->childCount() < 1) |
350 | populateVideoView(); | 348 | videoView->populateView(); |
351 | } | 349 | } |
352 | 350 | ||
353 | QListViewItemIterator videoIt( videoView ); | 351 | QListViewItemIterator videoIt( videoView ); |
354 | DocLnk lnk; | 352 | DocLnk lnk; |
355 | QString filename; | 353 | QString filename; |
356 | for ( ; videoIt.current(); ++videoIt ) { | 354 | for ( ; videoIt.current(); ++videoIt ) { |
357 | filename = videoIt.current()->text(3); | 355 | filename = videoIt.current()->text(3); |
358 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 356 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
359 | lnk.setFile( filename ); //sets file name | 357 | lnk.setFile( filename ); //sets file name |
360 | d->selectedFiles->addToSelection( lnk); | 358 | d->selectedFiles->addToSelection( lnk); |
361 | } | 359 | } |
362 | 360 | ||
@@ -563,38 +561,36 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
563 | { | 561 | { |
564 | if( !tbDeletePlaylist->isHidden() ) { | 562 | if( !tbDeletePlaylist->isHidden() ) { |
565 | tbDeletePlaylist->hide(); | 563 | tbDeletePlaylist->hide(); |
566 | } | 564 | } |
567 | d->tbRemoveFromList->setEnabled(TRUE); | 565 | d->tbRemoveFromList->setEnabled(TRUE); |
568 | d->tbAddToList->setEnabled(FALSE); | 566 | d->tbAddToList->setEnabled(FALSE); |
569 | 567 | ||
570 | d->tbPlay->setEnabled( !d->selectedFiles->isEmpty() ); | 568 | d->tbPlay->setEnabled( !d->selectedFiles->isEmpty() ); |
571 | } | 569 | } |
572 | break; | 570 | break; |
573 | case AudioFiles: | 571 | case AudioFiles: |
574 | { | 572 | { |
575 | // audioView->clear(); | 573 | audioView->populateView(); |
576 | if(!audioPopulated) populateAudioView(); | ||
577 | 574 | ||
578 | if( !tbDeletePlaylist->isHidden() ) { | 575 | if( !tbDeletePlaylist->isHidden() ) { |
579 | tbDeletePlaylist->hide(); | 576 | tbDeletePlaylist->hide(); |
580 | } | 577 | } |
581 | d->tbRemoveFromList->setEnabled(FALSE); | 578 | d->tbRemoveFromList->setEnabled(FALSE); |
582 | d->tbAddToList->setEnabled(TRUE); | 579 | d->tbAddToList->setEnabled(TRUE); |
583 | } | 580 | } |
584 | break; | 581 | break; |
585 | case VideoFiles: | 582 | case VideoFiles: |
586 | { | 583 | { |
587 | // videoView->clear(); | 584 | videoView->populateView(); |
588 | if(!videoPopulated) populateVideoView(); | ||
589 | if( !tbDeletePlaylist->isHidden() ) { | 585 | if( !tbDeletePlaylist->isHidden() ) { |
590 | tbDeletePlaylist->hide(); | 586 | tbDeletePlaylist->hide(); |
591 | } | 587 | } |
592 | d->tbRemoveFromList->setEnabled(FALSE); | 588 | d->tbRemoveFromList->setEnabled(FALSE); |
593 | d->tbAddToList->setEnabled(TRUE); | 589 | d->tbAddToList->setEnabled(TRUE); |
594 | } | 590 | } |
595 | break; | 591 | break; |
596 | case PlayLists: | 592 | case PlayLists: |
597 | { | 593 | { |
598 | if( tbDeletePlaylist->isHidden() ) { | 594 | if( tbDeletePlaylist->isHidden() ) { |
599 | tbDeletePlaylist->show(); | 595 | tbDeletePlaylist->show(); |
600 | } | 596 | } |
@@ -627,42 +623,28 @@ void PlayListWidget::deletePlaylist() { | |||
627 | break; | 623 | break; |
628 | }; | 624 | }; |
629 | } | 625 | } |
630 | 626 | ||
631 | 627 | ||
632 | void PlayListWidget::playSelected() { | 628 | void PlayListWidget::playSelected() { |
633 | btnPlay( TRUE); | 629 | btnPlay( TRUE); |
634 | } | 630 | } |
635 | 631 | ||
636 | 632 | ||
637 | void PlayListWidget::scanForAudio() { | 633 | void PlayListWidget::scanForAudio() { |
638 | audioView->scanFiles(); | 634 | audioView->scanFiles(); |
639 | audioView->scannedFiles() = true; | ||
640 | populateAudioView(); | ||
641 | } | 635 | } |
642 | 636 | ||
643 | void PlayListWidget::scanForVideo() { | 637 | void PlayListWidget::scanForVideo() { |
644 | videoView->scanFiles(); | 638 | videoView->scanFiles(); |
645 | videoView->scannedFiles() = true; | ||
646 | populateVideoView(); | ||
647 | } | ||
648 | |||
649 | void PlayListWidget::populateAudioView() { | ||
650 | audioView->populateView(); | ||
651 | audioPopulated = true; | ||
652 | } | ||
653 | |||
654 | void PlayListWidget::populateVideoView() { | ||
655 | videoView->populateView(); | ||
656 | videoPopulated=true; | ||
657 | } | 639 | } |
658 | 640 | ||
659 | QListView *PlayListWidget::currentFileListView() const | 641 | QListView *PlayListWidget::currentFileListView() const |
660 | { | 642 | { |
661 | switch ( currentTab() ) { | 643 | switch ( currentTab() ) { |
662 | case AudioFiles: return audioView; | 644 | case AudioFiles: return audioView; |
663 | case VideoFiles: return videoView; | 645 | case VideoFiles: return videoView; |
664 | default: assert( false ); | 646 | default: assert( false ); |
665 | } | 647 | } |
666 | return 0; | 648 | return 0; |
667 | } | 649 | } |
668 | 650 | ||