summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/playlistwidget.cpp
Unidiff
Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp176
1 files changed, 89 insertions, 87 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 3609f5d..d85ce50 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -20,25 +20,27 @@
20// code added by L. J. Potter Sat 03-02-2002 06:17:54 20// code added by L. J. Potter Sat 03-02-2002 06:17:54
21#define QTOPIA_INTERNAL_FSLP 21#define QTOPIA_INTERNAL_FSLP
22 22
23#include <qtoolbar.h> 23#include "playlistselection.h"
24#include "playlistwidget.h"
25#include "mediaplayerstate.h"
26#include "inputDialog.h"
27#include "audiowidget.h"
28#include "videowidget.h"
29
30/* OPIE */
24#include <qpe/qpemenubar.h> 31#include <qpe/qpemenubar.h>
25#include <qpe/lnkproperties.h> 32#include <qpe/lnkproperties.h>
33#include <opie2/odebug.h>
26 34
35/* QT */
36#include <qtoolbar.h>
27#include <qaction.h> 37#include <qaction.h>
28#include <qlayout.h> 38#include <qlayout.h>
29#include <qmessagebox.h> 39#include <qmessagebox.h>
30
31//#include <qtimer.h> 40//#include <qtimer.h>
32 41
33#include "playlistselection.h" 42/* STD */
34#include "playlistwidget.h"
35#include "mediaplayerstate.h"
36
37#include "inputDialog.h"
38
39#include <stdlib.h> 43#include <stdlib.h>
40#include "audiowidget.h"
41#include "videowidget.h"
42 44
43#include <unistd.h> 45#include <unistd.h>
44#include <sys/file.h> 46#include <sys/file.h>
@@ -145,7 +147,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
145 tbDeletePlaylist->setFlat(TRUE); 147 tbDeletePlaylist->setFlat(TRUE);
146 148
147 tbDeletePlaylist->setFixedSize(20,20); 149 tbDeletePlaylist->setFixedSize(20,20);
148 150
149 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist", 151 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist",
150 this , SLOT(addSelected()) ); 152 this , SLOT(addSelected()) );
151 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist", 153 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist",
@@ -192,10 +194,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
192 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); 194 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
193 195
194 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); 196 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
195 197
196 tabWidget = new QTabWidget( hbox6, "tabWidget" ); 198 tabWidget = new QTabWidget( hbox6, "tabWidget" );
197// tabWidget->setTabShape(QTabWidget::Triangular); 199// tabWidget->setTabShape(QTabWidget::Triangular);
198 200
199 QWidget *pTab; 201 QWidget *pTab;
200 pTab = new QWidget( tabWidget, "pTab" ); 202 pTab = new QWidget( tabWidget, "pTab" );
201// playlistView = new QListView( pTab, "playlistview" ); 203// playlistView = new QListView( pTab, "playlistview" );
@@ -204,7 +206,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
204 206
205 207
206 // Add the playlist area 208 // Add the playlist area
207 209
208 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); 210 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
209 d->playListFrame = vbox3; 211 d->playListFrame = vbox3;
210 212
@@ -221,7 +223,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
221 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); 223 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
222 224
223 225
224 226
225 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch 227 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
226 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); 228 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) );
227 new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) ); 229 new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) );
@@ -241,7 +243,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
241 audioView->addColumn(tr("Size"), -1); 243 audioView->addColumn(tr("Size"), -1);
242 audioView->addColumn(tr("Media"),-1); 244 audioView->addColumn(tr("Media"),-1);
243 audioView->addColumn( tr( "Path" ), -1 ); 245 audioView->addColumn( tr( "Path" ), -1 );
244 246
245 audioView->setColumnAlignment(1, Qt::AlignRight); 247 audioView->setColumnAlignment(1, Qt::AlignRight);
246 audioView->setColumnAlignment(2, Qt::AlignRight); 248 audioView->setColumnAlignment(2, Qt::AlignRight);
247 audioView->setAllColumnsShowFocus(TRUE); 249 audioView->setAllColumnsShowFocus(TRUE);
@@ -249,7 +251,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
249 audioView->setMultiSelection( TRUE ); 251 audioView->setMultiSelection( TRUE );
250 audioView->setSelectionMode( QListView::Extended); 252 audioView->setSelectionMode( QListView::Extended);
251 audioView->setSorting( 3, TRUE ); 253 audioView->setSorting( 3, TRUE );
252 254
253 tabWidget->insertTab(aTab,tr("Audio")); 255 tabWidget->insertTab(aTab,tr("Audio"));
254 256
255 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); 257 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
@@ -257,7 +259,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
257// audioView 259// audioView
258// populateAudioView(); 260// populateAudioView();
259// videowidget 261// videowidget
260 262
261 QWidget *vTab; 263 QWidget *vTab;
262 vTab = new QWidget( tabWidget, "vTab" ); 264 vTab = new QWidget( tabWidget, "vTab" );
263 videoView = new QListView( vTab, "Videoview" ); 265 videoView = new QListView( vTab, "Videoview" );
@@ -266,7 +268,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
266 layoutV->setSpacing( 2); 268 layoutV->setSpacing( 2);
267 layoutV->setMargin( 2); 269 layoutV->setMargin( 2);
268 layoutV->addMultiCellWidget( videoView, 0, 0, 0, 1 ); 270 layoutV->addMultiCellWidget( videoView, 0, 0, 0, 1 );
269 271
270 videoView->addColumn(tr("Title"),-1); 272 videoView->addColumn(tr("Title"),-1);
271 videoView->addColumn(tr("Size"),-1); 273 videoView->addColumn(tr("Size"),-1);
272 videoView->addColumn(tr("Media"),-1); 274 videoView->addColumn(tr("Media"),-1);
@@ -303,7 +305,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
303///audioView 305///audioView
304 connect( audioView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)), 306 connect( audioView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
305 this,SLOT( viewPressed(int,QListViewItem*,const QPoint&,int)) ); 307 this,SLOT( viewPressed(int,QListViewItem*,const QPoint&,int)) );
306 308
307 connect( audioView, SIGNAL( returnPressed(QListViewItem*)), 309 connect( audioView, SIGNAL( returnPressed(QListViewItem*)),
308 this,SLOT( playIt(QListViewItem*)) ); 310 this,SLOT( playIt(QListViewItem*)) );
309 connect( audioView, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( addToSelection(QListViewItem*) ) ); 311 connect( audioView, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( addToSelection(QListViewItem*) ) );
@@ -337,7 +339,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
337 currentPlayList = cfg.readEntry("CurrentPlaylist","default"); 339 currentPlayList = cfg.readEntry("CurrentPlaylist","default");
338 loadList(DocLnk( currentPlayList)); 340 loadList(DocLnk( currentPlayList));
339 setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlayList))); 341 setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlayList)));
340 342
341 initializeStates(); 343 initializeStates();
342} 344}
343 345
@@ -389,7 +391,7 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
389 if ( lnk ) { 391 if ( lnk ) {
390 QString entryName; 392 QString entryName;
391 entryName.sprintf( "File%i", noOfFiles + 1 ); 393 entryName.sprintf( "File%i", noOfFiles + 1 );
392// qDebug(entryName); 394// odebug << entryName << oendl;
393 cfg.writeEntry( entryName, lnk->linkFile() ); 395 cfg.writeEntry( entryName, lnk->linkFile() );
394 // if this link does exist, add it so we have the file 396 // if this link does exist, add it so we have the file
395 // next time... 397 // next time...
@@ -406,7 +408,7 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
406// ); 408// );
407// } 409// }
408 410
409 } 411 }
410 noOfFiles++; 412 noOfFiles++;
411 } 413 }
412 } 414 }
@@ -446,7 +448,7 @@ void PlayListWidget::addAllToList() {
446 if(QFileInfo(Adit.current()->file()).exists()) 448 if(QFileInfo(Adit.current()->file()).exists())
447 d->selectedFiles->addToSelection( **Adit ); 449 d->selectedFiles->addToSelection( **Adit );
448 tabWidget->setCurrentPage(0); 450 tabWidget->setCurrentPage(0);
449 451
450 writeCurrentM3u(); 452 writeCurrentM3u();
451 d->selectedFiles->first(); 453 d->selectedFiles->first();
452} 454}
@@ -454,11 +456,11 @@ void PlayListWidget::addAllToList() {
454 456
455void PlayListWidget::addAllMusicToList() { 457void PlayListWidget::addAllMusicToList() {
456 QListIterator<DocLnk> dit( files.children() ); 458 QListIterator<DocLnk> dit( files.children() );
457 for ( ; dit.current(); ++dit ) 459 for ( ; dit.current(); ++dit )
458 if(QFileInfo(dit.current()->file()).exists()) 460 if(QFileInfo(dit.current()->file()).exists())
459 d->selectedFiles->addToSelection( **dit ); 461 d->selectedFiles->addToSelection( **dit );
460 tabWidget->setCurrentPage(0); 462 tabWidget->setCurrentPage(0);
461 463
462 writeCurrentM3u(); 464 writeCurrentM3u();
463 d->selectedFiles->first(); 465 d->selectedFiles->first();
464} 466}
@@ -470,7 +472,7 @@ void PlayListWidget::addAllVideoToList() {
470 if(QFileInfo( dit.current()->file()).exists()) 472 if(QFileInfo( dit.current()->file()).exists())
471 d->selectedFiles->addToSelection( **dit ); 473 d->selectedFiles->addToSelection( **dit );
472 tabWidget->setCurrentPage(0); 474 tabWidget->setCurrentPage(0);
473 475
474 writeCurrentM3u(); 476 writeCurrentM3u();
475 d->selectedFiles->first(); 477 d->selectedFiles->first();
476} 478}
@@ -483,7 +485,7 @@ void PlayListWidget::setDocument(const QString& fileref) {
483} 485}
484 486
485void PlayListWidget::setDocumentEx(const QString& fileref) { 487void PlayListWidget::setDocumentEx(const QString& fileref) {
486 qDebug("opieplayer receive "+fileref); 488 odebug << "opieplayer receive "+fileref << oendl;
487 clearList(); 489 clearList();
488 DocLnk lnk; 490 DocLnk lnk;
489 QFileInfo fileInfo(fileref); 491 QFileInfo fileInfo(fileref);
@@ -492,7 +494,7 @@ void PlayListWidget::setDocumentEx(const QString& fileref) {
492 tr( "There was a problem in getting the file." ) ); 494 tr( "There was a problem in getting the file." ) );
493 return; 495 return;
494 } 496 }
495 // qDebug("<<<<<<<<<<<<<<<<<<<<<<setDocument "+fileref); 497 // odebug << "<<<<<<<<<<<<<<<<<<<<<<setDocument "+fileref << oendl;
496 QString extension = fileInfo.extension(false); 498 QString extension = fileInfo.extension(false);
497 if( extension.find( "m3u", 0, false) != -1) { //is m3u 499 if( extension.find( "m3u", 0, false) != -1) { //is m3u
498 readm3u( fileref); 500 readm3u( fileref);
@@ -534,7 +536,7 @@ void PlayListWidget::setDocumentEx(const QString& fileref) {
534 536
535 537
536void PlayListWidget::setActiveWindow() { 538void PlayListWidget::setActiveWindow() {
537 // qDebug("SETTING active window"); 539 // odebug << "SETTING active window" << oendl;
538 // When we get raised we need to ensure that it switches views 540 // When we get raised we need to ensure that it switches views
539 char origView = mediaPlayerState->view(); 541 char origView = mediaPlayerState->view();
540 mediaPlayerState->setView( 'l' ); // invalidate 542 mediaPlayerState->setView( 'l' ); // invalidate
@@ -551,7 +553,7 @@ const DocLnk *PlayListWidget::current() { // this is fugly
551 switch (tabWidget->currentPageIndex()) { 553 switch (tabWidget->currentPageIndex()) {
552 case 0: //playlist 554 case 0: //playlist
553 { 555 {
554 // qDebug("playlist"); 556 // odebug << "playlist" << oendl;
555 if ( mediaPlayerState->playlist() ) { 557 if ( mediaPlayerState->playlist() ) {
556 return d->selectedFiles->current(); 558 return d->selectedFiles->current();
557 } 559 }
@@ -564,7 +566,7 @@ const DocLnk *PlayListWidget::current() { // this is fugly
564 break; 566 break;
565 case 1://audio 567 case 1://audio
566 { 568 {
567 // qDebug("audioView"); 569 // odebug << "audioView" << oendl;
568 QListIterator<DocLnk> dit( files.children() ); 570 QListIterator<DocLnk> dit( files.children() );
569 for ( ; dit.current(); ++dit ) { 571 for ( ; dit.current(); ++dit ) {
570 if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { 572 if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
@@ -572,7 +574,7 @@ const DocLnk *PlayListWidget::current() { // this is fugly
572 return dit; 574 return dit;
573 } 575 }
574 } 576 }
575 } 577 }
576 break; 578 break;
577 case 2: // video 579 case 2: // video
578 { 580 {
@@ -660,11 +662,11 @@ void PlayListWidget::saveList() {
660 662
661void PlayListWidget::loadList( const DocLnk & lnk) { 663void PlayListWidget::loadList( const DocLnk & lnk) {
662 QString name = lnk.name(); 664 QString name = lnk.name();
663 // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name); 665 // odebug << "<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name << oendl;
664 666
665 if( name.length()>0) { 667 if( name.length()>0) {
666 setCaption("OpiePlayer: "+name); 668 setCaption("OpiePlayer: "+name);
667 // qDebug("<<<<<<<<<<<<load list "+ lnk.file()); 669 // odebug << "<<<<<<<<<<<<load list "+ lnk.file() << oendl;
668 clearList(); 670 clearList();
669 readm3u(lnk.file()); 671 readm3u(lnk.file());
670 tabWidget->setCurrentPage(0); 672 tabWidget->setCurrentPage(0);
@@ -672,7 +674,7 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
672} 674}
673 675
674void PlayListWidget::setPlaylist( bool shown ) { 676void PlayListWidget::setPlaylist( bool shown ) {
675 if ( shown ) 677 if ( shown )
676 d->playListFrame->show(); 678 d->playListFrame->show();
677 else 679 else
678 d->playListFrame->hide(); 680 d->playListFrame->hide();
@@ -707,7 +709,7 @@ void PlayListWidget::addSelected() {
707 // d->selectedFiles->next(); 709 // d->selectedFiles->next();
708 } 710 }
709 break; 711 break;
710 712
711 case 2: { // video 713 case 2: { // video
712 QListViewItemIterator it( videoView ); 714 QListViewItemIterator it( videoView );
713 for ( ; it.current(); ++it ) { 715 for ( ; it.current(); ++it ) {
@@ -724,7 +726,7 @@ void PlayListWidget::addSelected() {
724 break; 726 break;
725 }; 727 };
726 // tabWidget->setCurrentPage(0); 728 // tabWidget->setCurrentPage(0);
727 writeCurrentM3u(); 729 writeCurrentM3u();
728 730
729} 731}
730 732
@@ -757,11 +759,11 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
757 lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name 759 lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
758 lnk.setFile( filename ); //sets file name 760 lnk.setFile( filename ); //sets file name
759 d->selectedFiles->addToSelection( lnk); 761 d->selectedFiles->addToSelection( lnk);
760 762
761 if(tabWidget->currentPageIndex() == 0) 763 if(tabWidget->currentPageIndex() == 0)
762 writeCurrentM3u(); 764 writeCurrentM3u();
763 // tabWidget->setCurrentPage(0); 765 // tabWidget->setCurrentPage(0);
764 766
765 } 767 }
766} 768}
767 769
@@ -818,7 +820,7 @@ void PlayListWidget::btnPlay(bool b) {
818 // } else { 820 // } else {
819 mediaPlayerState->setPlaying(b); 821 mediaPlayerState->setPlaying(b);
820 insanityBool=FALSE; 822 insanityBool=FALSE;
821 qDebug("insanity"); 823 odebug << "insanity" << oendl;
822 // } 824 // }
823 } 825 }
824 break; 826 break;
@@ -830,12 +832,12 @@ void PlayListWidget::btnPlay(bool b) {
830 d->selectedFiles->removeSelected( ); 832 d->selectedFiles->removeSelected( );
831 d->selectedFiles->unSelect(); 833 d->selectedFiles->unSelect();
832 tabWidget->setCurrentPage(1); 834 tabWidget->setCurrentPage(1);
833 insanityBool=FALSE; 835 insanityBool=FALSE;
834 }// audioView->clearSelection(); 836 }// audioView->clearSelection();
835 break; 837 break;
836 case 2: 838 case 2:
837 { 839 {
838 840
839 addToSelection( videoView->currentItem() ); 841 addToSelection( videoView->currentItem() );
840 mediaPlayerState->setPlaying( b); 842 mediaPlayerState->setPlaying( b);
841 // qApp->processEvents(); 843 // qApp->processEvents();
@@ -846,7 +848,7 @@ void PlayListWidget::btnPlay(bool b) {
846 }// videoView->clearSelection(); 848 }// videoView->clearSelection();
847 break; 849 break;
848 }; 850 };
849 851
850} 852}
851 853
852void PlayListWidget::deletePlaylist() { 854void PlayListWidget::deletePlaylist() {
@@ -874,9 +876,9 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint&, int
874 m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); 876 m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
875 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); 877 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
876 m.insertSeparator(); 878 m.insertSeparator();
877 if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) 879 if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )
878 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); 880 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
879 881
880 m.exec( QCursor::pos() ); 882 m.exec( QCursor::pos() );
881 } 883 }
882 break; 884 break;
@@ -893,7 +895,7 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi
893{ 895{
894 switch (mouse) { 896 switch (mouse) {
895 case 1: 897 case 1:
896 898
897 break; 899 break;
898 case 2:{ 900 case 2:{
899 QPopupMenu m; 901 QPopupMenu m;
@@ -915,7 +917,7 @@ void PlayListWidget::listDelete() {
915 QString file; 917 QString file;
916 // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 918 // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
917 switch ( tabWidget->currentPageIndex()) { 919 switch ( tabWidget->currentPageIndex()) {
918 case 0: 920 case 0:
919 break; 921 break;
920 case 1: 922 case 1:
921 { 923 {
@@ -951,7 +953,7 @@ void PlayListWidget::listDelete() {
951} 953}
952 954
953void PlayListWidget::scanForAudio() { 955void PlayListWidget::scanForAudio() {
954 // qDebug("scan for audio"); 956 // odebug << "scan for audio" << oendl;
955 files.detachChildren(); 957 files.detachChildren();
956 QListIterator<DocLnk> sdit( files.children() ); 958 QListIterator<DocLnk> sdit( files.children() );
957 for ( ; sdit.current(); ++sdit ) { 959 for ( ; sdit.current(); ++sdit ) {
@@ -961,7 +963,7 @@ void PlayListWidget::scanForAudio() {
961 audioScan = true; 963 audioScan = true;
962} 964}
963void PlayListWidget::scanForVideo() { 965void PlayListWidget::scanForVideo() {
964 // qDebug("scan for video"); 966 // odebug << "scan for video" << oendl;
965 vFiles.detachChildren(); 967 vFiles.detachChildren();
966 QListIterator<DocLnk> sdit( vFiles.children() ); 968 QListIterator<DocLnk> sdit( vFiles.children() );
967 for ( ; sdit.current(); ++sdit ) { 969 for ( ; sdit.current(); ++sdit ) {
@@ -994,9 +996,9 @@ void PlayListWidget::populateAudioView() {
994 long size; 996 long size;
995 if( dit.current()->file().left(4) == "http" ) 997 if( dit.current()->file().left(4) == "http" )
996 size=0; 998 size=0;
997 else 999 else
998 size = QFile( dit.current()->file() ).size(); 1000 size = QFile( dit.current()->file() ).size();
999 // qDebug(dit.current()->name()); 1001 // odebug << dit.current()->name() << oendl;
1000 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), 1002 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
1001 QString::number(size ), storage, dit.current()->file()); 1003 QString::number(size ), storage, dit.current()->file());
1002 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); 1004 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
@@ -1040,7 +1042,7 @@ void PlayListWidget::openFile() {
1040 fileDlg->exec(); 1042 fileDlg->exec();
1041 if( fileDlg->result() == 1 ) { 1043 if( fileDlg->result() == 1 ) {
1042 filename = fileDlg->text(); 1044 filename = fileDlg->text();
1043 // qDebug( "Selected filename is " + filename ); 1045 // odebug << "Selected filename is " + filename << oendl;
1044 DocLnk lnk; 1046 DocLnk lnk;
1045 Config cfg( "OpiePlayer" ); 1047 Config cfg( "OpiePlayer" );
1046 cfg.setGroup("PlayList"); 1048 cfg.setGroup("PlayList");
@@ -1075,7 +1077,7 @@ void PlayListWidget::openFile() {
1075 writeCurrentM3u(); 1077 writeCurrentM3u();
1076 } 1078 }
1077 } 1079 }
1078 1080
1079 if( fileDlg ) { 1081 if( fileDlg ) {
1080 delete fileDlg; 1082 delete fileDlg;
1081 } 1083 }
@@ -1084,8 +1086,8 @@ void PlayListWidget::openFile() {
1084 1086
1085/* 1087/*
1086reads m3u and shows files/urls to playlist widget */ 1088reads m3u and shows files/urls to playlist widget */
1087void PlayListWidget::readm3u( const QString &filename ) { 1089void PlayListWidget::readm3u( const QString &filename ) {
1088 // qDebug( "read m3u filename " + filename ); 1090 // odebug << "read m3u filename " + filename << oendl;
1089 1091
1090 Om3u *m3uList; 1092 Om3u *m3uList;
1091 QString s, name; 1093 QString s, name;
@@ -1094,7 +1096,7 @@ void PlayListWidget::readm3u( const QString &filename ) {
1094 DocLnk lnk; 1096 DocLnk lnk;
1095 for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { 1097 for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
1096 s = *it; 1098 s = *it;
1097 // qDebug("reading "+ s); 1099 // odebug << "reading "+ s << oendl;
1098 if(s.left(4)=="http") { 1100 if(s.left(4)=="http") {
1099 lnk.setName( s ); //sets file name 1101 lnk.setName( s ); //sets file name
1100 lnk.setIcon("opieplayer2/musicfile"); 1102 lnk.setIcon("opieplayer2/musicfile");
@@ -1105,17 +1107,17 @@ void PlayListWidget::readm3u( const QString &filename ) {
1105 lnk.setFile( s+"/"); //if url with no extension 1107 lnk.setFile( s+"/"); //if url with no extension
1106 else 1108 else
1107 lnk.setFile( s ); //sets file name 1109 lnk.setFile( s ); //sets file name
1108 1110
1109 } else { 1111 } else {
1110 // if( QFileInfo( s ).exists() ) { 1112 // if( QFileInfo( s ).exists() ) {
1111 lnk.setName( fullBaseName ( QFileInfo(s))); 1113 lnk.setName( fullBaseName ( QFileInfo(s)));
1112 // if(s.right(4) == '.') {//if regular file 1114 // if(s.right(4) == '.') {//if regular file
1113 if(s.left(1) != "/") { 1115 if(s.left(1) != "/") {
1114 // qDebug("set link "+QFileInfo(filename).dirPath()+"/"+s); 1116 // odebug << "set link "+QFileInfo(filename).dirPath()+"/"+s << oendl;
1115 lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); 1117 lnk.setFile( QFileInfo(filename).dirPath()+"/"+s);
1116 lnk.setIcon("SoundPlayer"); 1118 lnk.setIcon("SoundPlayer");
1117 } else { 1119 } else {
1118 // qDebug("set link2 "+s); 1120 // odebug << "set link2 "+s << oendl;
1119 lnk.setFile( s); 1121 lnk.setFile( s);
1120 lnk.setIcon("SoundPlayer"); 1122 lnk.setIcon("SoundPlayer");
1121 } 1123 }
@@ -1135,14 +1137,14 @@ void PlayListWidget::readm3u( const QString &filename ) {
1135 1137
1136 d->selectedFiles->setSelectedItem( s); 1138 d->selectedFiles->setSelectedItem( s);
1137 setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename))); 1139 setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename)));
1138 1140
1139} 1141}
1140 1142
1141/* 1143/*
1142reads pls and adds files/urls to playlist */ 1144reads pls and adds files/urls to playlist */
1143void PlayListWidget::readPls( const QString &filename ) { 1145void PlayListWidget::readPls( const QString &filename ) {
1144 1146
1145 // qDebug( "pls filename is " + filename ); 1147 // odebug << "pls filename is " + filename << oendl;
1146 Om3u *m3uList; 1148 Om3u *m3uList;
1147 QString s, name; 1149 QString s, name;
1148 m3uList = new Om3u( filename, IO_ReadOnly ); 1150 m3uList = new Om3u( filename, IO_ReadOnly );
@@ -1185,7 +1187,7 @@ void PlayListWidget::readPls( const QString &filename ) {
1185/* 1187/*
1186 writes current playlist to current m3u file */ 1188 writes current playlist to current m3u file */
1187void PlayListWidget::writeCurrentM3u() { 1189void PlayListWidget::writeCurrentM3u() {
1188 // qDebug("writing to current m3u"); 1190 // odebug << "writing to current m3u" << oendl;
1189 Config cfg( "OpiePlayer" ); 1191 Config cfg( "OpiePlayer" );
1190 cfg.setGroup("PlayList"); 1192 cfg.setGroup("PlayList");
1191 currentPlayList = cfg.readEntry("CurrentPlaylist",""); 1193 currentPlayList = cfg.readEntry("CurrentPlaylist","");
@@ -1194,11 +1196,11 @@ void PlayListWidget::writeCurrentM3u() {
1194 1196
1195 if( d->selectedFiles->first()) { 1197 if( d->selectedFiles->first()) {
1196 do { 1198 do {
1197 // qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file()); 1199 // odebug << "writeCurrentM3u " +d->selectedFiles->current()->file() << oendl;
1198 m3uList->add( d->selectedFiles->current()->file() ); 1200 m3uList->add( d->selectedFiles->current()->file() );
1199 } 1201 }
1200 while ( d->selectedFiles->next() ); 1202 while ( d->selectedFiles->next() );
1201 // qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); 1203 // odebug << "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" << oendl;
1202 m3uList->write(); 1204 m3uList->write();
1203 m3uList->close(); 1205 m3uList->close();
1204 1206
@@ -1217,7 +1219,7 @@ void PlayListWidget::writem3u() {
1217 1219
1218 if( fileDlg->result() == 1 ) { 1220 if( fileDlg->result() == 1 ) {
1219 name = fileDlg->text(); 1221 name = fileDlg->text();
1220 // qDebug( filename ); 1222 // odebug << filename << oendl;
1221 if( name.find("/",0,true) != -1) {// assume they specify a file path 1223 if( name.find("/",0,true) != -1) {// assume they specify a file path
1222 filename = name; 1224 filename = name;
1223 name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); 1225 name = name.right(name.length()- name.findRev("/",-1,true) - 1 );
@@ -1227,7 +1229,7 @@ void PlayListWidget::writem3u() {
1227 1229
1228 if( filename.right( 3 ) != "m3u" ) //needs filename extension 1230 if( filename.right( 3 ) != "m3u" ) //needs filename extension
1229 filename += ".m3u"; 1231 filename += ".m3u";
1230 1232
1231 if( d->selectedFiles->first()) { 1233 if( d->selectedFiles->first()) {
1232 m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); 1234 m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate);
1233 1235
@@ -1235,11 +1237,11 @@ void PlayListWidget::writem3u() {
1235 m3uList->add( d->selectedFiles->current()->file()); 1237 m3uList->add( d->selectedFiles->current()->file());
1236 } 1238 }
1237 while ( d->selectedFiles->next() ); 1239 while ( d->selectedFiles->next() );
1238 // qDebug( list ); 1240 // odebug << list << oendl;
1239 m3uList->write(); 1241 m3uList->write();
1240 m3uList->close(); 1242 m3uList->close();
1241 if(m3uList) delete m3uList; 1243 if(m3uList) delete m3uList;
1242 1244
1243 if(fileDlg) delete fileDlg; 1245 if(fileDlg) delete fileDlg;
1244 1246
1245 DocLnk lnk; 1247 DocLnk lnk;
@@ -1247,15 +1249,15 @@ void PlayListWidget::writem3u() {
1247 lnk.setIcon("opieplayer2/playlist2"); 1249 lnk.setIcon("opieplayer2/playlist2");
1248 lnk.setName( name); //sets file name 1250 lnk.setName( name); //sets file name
1249 1251
1250 // qDebug(filename); 1252 // odebug << filename << oendl;
1251 Config config( "OpiePlayer" ); 1253 Config config( "OpiePlayer" );
1252 config.setGroup( "PlayList" ); 1254 config.setGroup( "PlayList" );
1253 1255
1254 config.writeEntry("CurrentPlaylist",filename); 1256 config.writeEntry("CurrentPlaylist",filename);
1255 currentPlayList=filename; 1257 currentPlayList=filename;
1256 1258
1257 if(!lnk.writeLink()) { 1259 if(!lnk.writeLink()) {
1258 // qDebug("Writing doclink did not work"); 1260 // odebug << "Writing doclink did not work" << oendl;
1259 } 1261 }
1260 1262
1261 setCaption(tr("OpiePlayer: ") + name); 1263 setCaption(tr("OpiePlayer: ") + name);
@@ -1291,7 +1293,7 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
1291 removeSelected(); 1293 removeSelected();
1292 break; 1294 break;
1293// case Key_P: //play 1295// case Key_P: //play
1294// qDebug("Play"); 1296// odebug << "Play" << oendl;
1295// playSelected(); 1297// playSelected();
1296// break; 1298// break;
1297 case Key_Space: 1299 case Key_Space:
@@ -1307,7 +1309,7 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
1307 tabWidget->setCurrentPage(2); 1309 tabWidget->setCurrentPage(2);
1308 break; 1310 break;
1309 case Key_4: 1311 case Key_4:
1310 tabWidget->setCurrentPage(3); 1312 tabWidget->setCurrentPage(3);
1311 break; 1313 break;
1312 case Key_Down: 1314 case Key_Down:
1313 if ( !d->selectedFiles->next() ) 1315 if ( !d->selectedFiles->next() )
@@ -1319,35 +1321,35 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
1319 // d->selectedFiles->last(); 1321 // d->selectedFiles->last();
1320 1322
1321 break; 1323 break;
1322 1324
1323 } 1325 }
1324} 1326}
1325 1327
1326void PlayListWidget::keyPressEvent( QKeyEvent *) 1328void PlayListWidget::keyPressEvent( QKeyEvent *)
1327{ 1329{
1328// qDebug("Key press"); 1330// odebug << "Key press" << oendl;
1329// switch ( e->key() ) { 1331// switch ( e->key() ) {
1330// ////////////////////////////// Zaurus keys 1332// ////////////////////////////// Zaurus keys
1331// case Key_A: //add to playlist 1333// case Key_A: //add to playlist
1332// qDebug("Add"); 1334// odebug << "Add" << oendl;
1333// addSelected(); 1335// addSelected();
1334// break; 1336// break;
1335// case Key_R: //remove from playlist 1337// case Key_R: //remove from playlist
1336// removeSelected(); 1338// removeSelected();
1337// break; 1339// break;
1338// case Key_P: //play 1340// case Key_P: //play
1339// qDebug("Play"); 1341// odebug << "Play" << oendl;
1340// playSelected(); 1342// playSelected();
1341// break; 1343// break;
1342// case Key_Space: 1344// case Key_Space:
1343// qDebug("Play"); 1345// odebug << "Play" << oendl;
1344// playSelected(); 1346// playSelected();
1345// break; 1347// break;
1346// } 1348// }
1347} 1349}
1348 1350
1349void PlayListWidget::doBlank() { 1351void PlayListWidget::doBlank() {
1350 // qDebug("do blanking"); 1352 // odebug << "do blanking" << oendl;
1351#ifdef QT_QWS_DEVFS 1353#ifdef QT_QWS_DEVFS
1352 fd=open("/dev/fb/0",O_RDWR); 1354 fd=open("/dev/fb/0",O_RDWR);
1353#else 1355#else
@@ -1363,7 +1365,7 @@ void PlayListWidget::doUnblank() {
1363 // this crashes opieplayer with a segfault 1365 // this crashes opieplayer with a segfault
1364 // int fd; 1366 // int fd;
1365 // fd=open("/dev/fb0",O_RDWR); 1367 // fd=open("/dev/fb0",O_RDWR);
1366 // qDebug("do unblanking"); 1368 // odebug << "do unblanking" << oendl;
1367 if (fd != -1) { 1369 if (fd != -1) {
1368 ioctl(fd,FBIOBLANK,0); 1370 ioctl(fd,FBIOBLANK,0);
1369 close(fd); 1371 close(fd);
@@ -1388,7 +1390,7 @@ void PlayListWidget::populateSkinsMenu() {
1388 QFileInfo *fi; 1390 QFileInfo *fi;
1389 while ( ( fi = it.current() ) ) { 1391 while ( ( fi = it.current() ) ) {
1390 skinName = fi->fileName(); 1392 skinName = fi->fileName();
1391 // qDebug( fi->fileName() ); 1393 // odebug << fi->fileName() << oendl;
1392 if( skinName != "." && skinName != ".." && skinName !="CVS" ) { 1394 if( skinName != "." && skinName != ".." && skinName !="CVS" ) {
1393 item = skinsMenu->insertItem( fi->fileName() ) ; 1395 item = skinsMenu->insertItem( fi->fileName() ) ;
1394 } 1396 }
@@ -1414,7 +1416,7 @@ void PlayListWidget::skinsMenuActivated( int item ) {
1414} 1416}
1415 1417
1416void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { 1418void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
1417 // qDebug("qcop message "+msg ); 1419 // odebug << "qcop message "+msg << oendl;
1418 QDataStream stream ( data, IO_ReadOnly ); 1420 QDataStream stream ( data, IO_ReadOnly );
1419 if ( msg == "play()" ) { //plays current selection 1421 if ( msg == "play()" ) { //plays current selection
1420 btnPlay( true); 1422 btnPlay( true);
@@ -1423,9 +1425,9 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
1423 } else if ( msg == "togglePause()" ) { 1425 } else if ( msg == "togglePause()" ) {
1424 mediaPlayerState->togglePaused(); 1426 mediaPlayerState->togglePaused();
1425 } else if ( msg == "next()" ) { //select next in lis 1427 } else if ( msg == "next()" ) { //select next in lis
1426 mediaPlayerState->setNext(); 1428 mediaPlayerState->setNext();
1427 } else if ( msg == "prev()" ) { //select previous in list 1429 } else if ( msg == "prev()" ) { //select previous in list
1428 mediaPlayerState->setPrev(); 1430 mediaPlayerState->setPrev();
1429 } else if ( msg == "toggleLooping()" ) { //loop or not loop 1431 } else if ( msg == "toggleLooping()" ) { //loop or not loop
1430 mediaPlayerState->toggleLooping(); 1432 mediaPlayerState->toggleLooping();
1431 } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled 1433 } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled