summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 4c4a921..19724cb 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -246,131 +246,131 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi
246 { 246 {
247 QPopupMenu m; 247 QPopupMenu m;
248 m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); 248 m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
249 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); 249 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
250 m.exec( QCursor::pos() ); 250 m.exec( QCursor::pos() );
251 } 251 }
252 break; 252 break;
253 } 253 }
254} 254}
255 255
256 256
257void PlayListWidget::addAllToList() { 257void PlayListWidget::addAllToList() {
258 DocLnkSet filesAll; 258 DocLnkSet filesAll;
259 Global::findDocuments(&filesAll, "video/*;audio/*"); 259 Global::findDocuments(&filesAll, "video/*;audio/*");
260 QListIterator<DocLnk> Adit( filesAll.children() ); 260 QListIterator<DocLnk> Adit( filesAll.children() );
261 for ( ; Adit.current(); ++Adit ) { 261 for ( ; Adit.current(); ++Adit ) {
262 if( QFileInfo( Adit.current()->file() ).exists() ) { 262 if( QFileInfo( Adit.current()->file() ).exists() ) {
263 d->selectedFiles->addToSelection( **Adit ); 263 d->selectedFiles->addToSelection( **Adit );
264 } 264 }
265 } 265 }
266} 266}
267 267
268 268
269void PlayListWidget::addAllMusicToList() { 269void PlayListWidget::addAllMusicToList() {
270 QListIterator<DocLnk> dit( files.children() ); 270 QListIterator<DocLnk> dit( files.children() );
271 for ( ; dit.current(); ++dit ) { 271 for ( ; dit.current(); ++dit ) {
272 if( QFileInfo(dit.current()->file() ).exists() ) { 272 if( QFileInfo(dit.current()->file() ).exists() ) {
273 d->selectedFiles->addToSelection( **dit ); 273 d->selectedFiles->addToSelection( **dit );
274 } 274 }
275 } 275 }
276} 276}
277 277
278 278
279void PlayListWidget::addAllVideoToList() { 279void PlayListWidget::addAllVideoToList() {
280 QListIterator<DocLnk> dit( vFiles.children() ); 280 QListIterator<DocLnk> dit( vFiles.children() );
281 for ( ; dit.current(); ++dit ) { 281 for ( ; dit.current(); ++dit ) {
282 if( QFileInfo( dit.current()->file() ).exists() ) { 282 if( QFileInfo( dit.current()->file() ).exists() ) {
283 d->selectedFiles->addToSelection( **dit ); 283 d->selectedFiles->addToSelection( **dit );
284 } 284 }
285 } 285 }
286} 286}
287 287
288 288
289void PlayListWidget::setDocument( const QString& fileref ) { 289void PlayListWidget::setDocument( const QString& fileref ) {
290 //qDebug( fileref ); 290 //qDebug( fileref );
291 fromSetDocument = TRUE; 291 fromSetDocument = TRUE;
292 if ( fileref.isNull() ) { 292 if ( fileref.isNull() ) {
293 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); 293 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
294 return; 294 return;
295 } 295 }
296 296
297 if( fileref.find( "m3u", 0, TRUE) != -1 ) { //is m3u 297 if( fileref.find( "m3u", 0, TRUE) != -1 ) { //is m3u
298 readm3u( fileref ); 298 readm3u( fileref );
299 } else if( fileref.find( "pls", 0, TRUE) != -1 ) { //is pls 299 } else if( fileref.find( "pls", 0, TRUE) != -1 ) { //is pls
300 readPls( fileref ); 300 readPls( fileref );
301 } else if( fileref.find( "playlist", 0, TRUE) != -1 ) {//is playlist 301 } else if( fileref.find( "playlist", 0, TRUE) != -1 ) {//is playlist
302 clearList(); 302 clearList();
303 loadList( DocLnk( fileref ) ); 303 loadList( DocLnk( fileref ) );
304 d->selectedFiles->first(); 304 d->selectedFiles->first();
305 } else { 305 } else {
306 clearList(); 306 clearList();
307 addToSelection( DocLnk( fileref ) ); 307 addToSelection( DocLnk( fileref ) );
308 d->setDocumentUsed = TRUE; 308 d->setDocumentUsed = TRUE;
309 mediaPlayerState->setPlaying( FALSE ); 309 mediaPlayerState->setPlaying( FALSE );
310 qApp->processEvents(); 310// qApp->processEvents();
311 mediaPlayerState->setPlaying( TRUE ); 311 mediaPlayerState->setPlaying( TRUE );
312 qApp->processEvents(); 312// qApp->processEvents();
313 setCaption( tr("OpiePlayer") ); 313 setCaption( tr("OpiePlayer") );
314 } 314 }
315} 315}
316 316
317 317
318void PlayListWidget::useSelectedDocument() { 318void PlayListWidget::useSelectedDocument() {
319 d->setDocumentUsed = FALSE; 319 d->setDocumentUsed = FALSE;
320} 320}
321 321
322 322
323const DocLnk *PlayListWidget::current() { // this is fugly 323const DocLnk *PlayListWidget::current() { // this is fugly
324 switch ( whichList() ) { 324 switch ( whichList() ) {
325 case 0: //playlist 325 case 0: //playlist
326 { 326 {
327// qDebug("playlist"); 327// qDebug("playlist");
328 if ( mediaPlayerState->playlist() ) { 328 if ( mediaPlayerState->playlist() ) {
329 return d->selectedFiles->current(); 329 return d->selectedFiles->current();
330 } else if ( d->setDocumentUsed && d->current ) { 330 } else if ( d->setDocumentUsed && d->current ) {
331 return d->current; 331 return d->current;
332 } else { 332 } else {
333 return &(d->files->selectedDocument()); 333 return &(d->files->selectedDocument());
334 } 334 }
335 } 335 }
336 break; 336 break;
337 }; 337 };
338 return 0; 338 return 0;
339} 339}
340 340
341 341
342bool PlayListWidget::prev() { 342bool PlayListWidget::prev() {
343 if ( mediaPlayerState->playlist() ) { 343 if ( mediaPlayerState->playlist() ) {
344 if ( mediaPlayerState->shuffled() ) { 344 if ( mediaPlayerState->shuffled() ) {
345 const DocLnk *cur = current(); 345 const DocLnk *cur = current();
346 int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); 346 int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
347 for ( int i = 0; i < j; i++ ) { 347 for ( int i = 0; i < j; i++ ) {
348 if ( !d->selectedFiles->next() ) 348 if ( !d->selectedFiles->next() )
349 d->selectedFiles->first(); 349 d->selectedFiles->first();
350 } 350 }
351 if ( cur == current() ) 351 if ( cur == current() )
352 if ( !d->selectedFiles->next() ) { 352 if ( !d->selectedFiles->next() ) {
353 d->selectedFiles->first(); 353 d->selectedFiles->first();
354 } 354 }
355 return TRUE; 355 return TRUE;
356 } else { 356 } else {
357 if ( !d->selectedFiles->prev() ) { 357 if ( !d->selectedFiles->prev() ) {
358 if ( mediaPlayerState->looping() ) { 358 if ( mediaPlayerState->looping() ) {
359 return d->selectedFiles->last(); 359 return d->selectedFiles->last();
360 } else { 360 } else {
361 return FALSE; 361 return FALSE;
362 } 362 }
363 } 363 }
364 return TRUE; 364 return TRUE;
365 } 365 }
366 } else { 366 } else {
367 return mediaPlayerState->looping(); 367 return mediaPlayerState->looping();
368 } 368 }
369} 369}
370 370
371 371
372bool PlayListWidget::next() { 372bool PlayListWidget::next() {
373qDebug("<<<<<<<<<<<<next()"); 373qDebug("<<<<<<<<<<<<next()");
374 if ( mediaPlayerState->playlist() ) { 374 if ( mediaPlayerState->playlist() ) {
375 if ( mediaPlayerState->shuffled() ) { 375 if ( mediaPlayerState->shuffled() ) {
376 return prev(); 376 return prev();
@@ -552,129 +552,129 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
552 if(QFileInfo( dit.current()->file()).exists()) 552 if(QFileInfo( dit.current()->file()).exists())
553 d->selectedFiles->addToSelection( **dit ); 553 d->selectedFiles->addToSelection( **dit );
554 } 554 }
555 } 555 }
556 } 556 }
557 break; 557 break;
558 case 0: 558 case 0:
559 break; 559 break;
560 }; 560 };
561 tabWidget->setCurrentPage(0); 561 tabWidget->setCurrentPage(0);
562 } 562 }
563} 563}
564 564
565 565
566void PlayListWidget::tabChanged(QWidget *) { 566void PlayListWidget::tabChanged(QWidget *) {
567 567
568 switch ( whichList()) { 568 switch ( whichList()) {
569 case 0: 569 case 0:
570 { 570 {
571 if( !tbDeletePlaylist->isHidden() ) { 571 if( !tbDeletePlaylist->isHidden() ) {
572 tbDeletePlaylist->hide(); 572 tbDeletePlaylist->hide();
573 } 573 }
574 d->tbRemoveFromList->setEnabled(TRUE); 574 d->tbRemoveFromList->setEnabled(TRUE);
575 d->tbAddToList->setEnabled(FALSE); 575 d->tbAddToList->setEnabled(FALSE);
576 } 576 }
577 break; 577 break;
578 case 1: 578 case 1:
579 { 579 {
580 audioView->clear(); 580 audioView->clear();
581 populateAudioView(); 581 populateAudioView();
582 582
583 if( !tbDeletePlaylist->isHidden() ) { 583 if( !tbDeletePlaylist->isHidden() ) {
584 tbDeletePlaylist->hide(); 584 tbDeletePlaylist->hide();
585 } 585 }
586 d->tbRemoveFromList->setEnabled(FALSE); 586 d->tbRemoveFromList->setEnabled(FALSE);
587 d->tbAddToList->setEnabled(TRUE); 587 d->tbAddToList->setEnabled(TRUE);
588 } 588 }
589 break; 589 break;
590 case 2: 590 case 2:
591 { 591 {
592 videoView->clear(); 592 videoView->clear();
593 populateVideoView(); 593 populateVideoView();
594 if( !tbDeletePlaylist->isHidden() ) { 594 if( !tbDeletePlaylist->isHidden() ) {
595 tbDeletePlaylist->hide(); 595 tbDeletePlaylist->hide();
596 } 596 }
597 d->tbRemoveFromList->setEnabled(FALSE); 597 d->tbRemoveFromList->setEnabled(FALSE);
598 d->tbAddToList->setEnabled(TRUE); 598 d->tbAddToList->setEnabled(TRUE);
599 } 599 }
600 break; 600 break;
601 case 3: 601 case 3:
602 { 602 {
603 if( tbDeletePlaylist->isHidden() ) { 603 if( tbDeletePlaylist->isHidden() ) {
604 tbDeletePlaylist->show(); 604 tbDeletePlaylist->show();
605 } 605 }
606 playLists->reread(); 606 playLists->reread();
607 } 607 }
608 break; 608 break;
609 }; 609 };
610} 610}
611 611
612 612
613void PlayListWidget::btnPlay(bool b) { 613void PlayListWidget::btnPlay(bool b) {
614// mediaPlayerState->setPlaying(false); 614// mediaPlayerState->setPlaying(false);
615 mediaPlayerState->setPlaying(b); 615 mediaPlayerState->setPlaying(b);
616 qApp->processEvents(); 616// qApp->processEvents();
617 insanityBool=FALSE; 617 insanityBool=FALSE;
618// switch ( whichList()) { 618// switch ( whichList()) {
619// case 0: 619// case 0:
620// { 620// {
621// mediaPlayerState->setPlaying(b); 621// mediaPlayerState->setPlaying(b);
622// } 622// }
623// break; 623// break;
624// case 1: 624// case 1:
625// { 625// {
626// mediaPlayerState->setPlaying(b); 626// mediaPlayerState->setPlaying(b);
627// qApp->processEvents(); 627// qApp->processEvents();
628// insanityBool=FALSE; 628// insanityBool=FALSE;
629// }// audioView->clearSelection(); 629// }// audioView->clearSelection();
630// break; 630// break;
631// case 2: 631// case 2:
632// { 632// {
633// // addToSelection( videoView->currentItem() ); 633// // addToSelection( videoView->currentItem() );
634// mediaPlayerState->setPlaying(b); 634// mediaPlayerState->setPlaying(b);
635// qApp->processEvents(); 635// qApp->processEvents();
636// // d->selectedFiles->removeSelected( ); 636// // d->selectedFiles->removeSelected( );
637// // tabWidget->setCurrentPage(2); 637// // tabWidget->setCurrentPage(2);
638// // d->selectedFiles->unSelect(); 638// // d->selectedFiles->unSelect();
639// insanityBool=FALSE; 639// insanityBool=FALSE;
640// }// videoView->clearSelection(); 640// }// videoView->clearSelection();
641// break; 641// break;
642// }; 642// };
643 643
644} 644}
645 645
646void PlayListWidget::deletePlaylist() { 646void PlayListWidget::deletePlaylist() {
647 switch( QMessageBox::information( this, (tr("Remove Playlist?")), 647 switch( QMessageBox::information( this, (tr("Remove Playlist?")),
648 (tr("You really want to delete\nthis playlist?")), 648 (tr("You really want to delete\nthis playlist?")),
649 (tr("Yes")), (tr("No")), 0 )){ 649 (tr("Yes")), (tr("No")), 0 )){
650 case 0: // Yes clicked, 650 case 0: // Yes clicked,
651 QFile().remove(playLists->selectedDocument().file()); 651 QFile().remove(playLists->selectedDocument().file());
652 QFile().remove(playLists->selectedDocument().linkFile()); 652 QFile().remove(playLists->selectedDocument().linkFile());
653 playLists->reread(); 653 playLists->reread();
654 break; 654 break;
655 case 1: // Cancel 655 case 1: // Cancel
656 break; 656 break;
657 }; 657 };
658} 658}
659 659
660 660
661void PlayListWidget::playSelected() { 661void PlayListWidget::playSelected() {
662 btnPlay( TRUE); 662 btnPlay( TRUE);
663} 663}
664 664
665 665
666void PlayListWidget::scanForAudio() { 666void PlayListWidget::scanForAudio() {
667// qDebug("scan for audio"); 667// qDebug("scan for audio");
668 files.detachChildren(); 668 files.detachChildren();
669 QListIterator<DocLnk> sdit( files.children() ); 669 QListIterator<DocLnk> sdit( files.children() );
670 for ( ; sdit.current(); ++sdit ) { 670 for ( ; sdit.current(); ++sdit ) {
671 delete sdit.current(); 671 delete sdit.current();
672 } 672 }
673 Global::findDocuments(&files, "audio/*"); 673 Global::findDocuments(&files, "audio/*");
674 audioScan = TRUE; 674 audioScan = TRUE;
675} 675}
676 676
677void PlayListWidget::scanForVideo() { 677void PlayListWidget::scanForVideo() {
678// qDebug("scan for video"); 678// qDebug("scan for video");
679 vFiles.detachChildren(); 679 vFiles.detachChildren();
680 QListIterator<DocLnk> sdit( vFiles.children() ); 680 QListIterator<DocLnk> sdit( vFiles.children() );