take out some debug mesasges

1 files changed, 8 insertions, 11 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 5c804f5..404e1fe 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -39,129 +39,129 @@
 
 #include "inputDialog.h"
 
 #include <stdlib.h>
 #include "audiowidget.h"
 #include "videowidget.h"
 
 #define BUTTONS_ON_TOOLBAR
 #define SIDE_BUTTONS
 #define CAN_SAVE_LOAD_PLAYLISTS
 
 extern MediaPlayerState *mediaPlayerState;
 
 
 class PlayListWidgetPrivate {
 public:
   QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
   QFrame *playListFrame;
   FileSelector *files;
   PlayListSelection *selectedFiles;
   bool setDocumentUsed;
   DocLnk *current;
 };
 
 
 class ToolButton : public QToolButton {
 public:
   ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
     : QToolButton( parent, name ) {
     setTextLabel( name );
     setPixmap( Resource::loadPixmap( icon ) );
     setAutoRaise( TRUE );
     setFocusPolicy( QWidget::NoFocus );
     setToggleButton( t );
     connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
     QPEMenuToolFocusManager::manager()->addWidget( this );
   }
 };
 
 
 class MenuItem : public QAction {
 public:
   MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
     : QAction( text, QString::null, 0, 0 ) {
     connect( this, SIGNAL( activated() ), handler, slot );
     addTo( parent );
   }
 };
 
 
 PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
   : QMainWindow( parent, name, fl ) {
 
   d = new PlayListWidgetPrivate;
   d->setDocumentUsed = FALSE;
   d->current = NULL;
   fromSetDocument = FALSE;
   insanityBool=FALSE;
   audioScan = FALSE;
   videoScan = FALSE;
 
   setBackgroundMode( PaletteButton );
 
 //  setCaption( tr("OpiePlayer") );
-  setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) );
+//  setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) );
 
   setToolBarsMovable( FALSE );
 
   // Create Toolbar
   QPEToolBar *toolbar = new QPEToolBar( this );
   toolbar->setHorizontalStretchable( TRUE );
 
   // Create Menubar
   QPEMenuBar *menu = new QPEMenuBar( toolbar );
   menu->setMargin( 0 );
 
   QPEToolBar *bar = new QPEToolBar( this );
   bar->setLabel( tr( "Play Operations" ) );
 
   tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
   tbDeletePlaylist->setFlat(TRUE);
   tbDeletePlaylist->setFixedSize(20,20);
 
   d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer2/add_to_playlist",
                                     this , SLOT(addSelected()) );
   d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer2/remove_from_playlist",
                                         this , SLOT(removeSelected()) );
   d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
                                  this , SLOT( btnPlay(bool) ), TRUE );
   d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
                                  mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
   d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"opieplayer2/loop",
                                  mediaPlayerState, SLOT(setLooping(bool)), TRUE );
   tbDeletePlaylist->hide();
 
   QPopupMenu *pmPlayList = new QPopupMenu( this );
   menu->insertItem( tr( "File" ), pmPlayList );
   (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
   (void)new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) );
   (void)new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) );
   (void)new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) );
   pmPlayList->insertSeparator(-1);
   (void)new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
   (void)new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) );
   pmPlayList->insertSeparator(-1);
   (void)new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) );
   pmPlayList->insertSeparator(-1);
   (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) );
   (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) );
 
   pmView = new QPopupMenu( this );
   menu->insertItem( tr( "View" ), pmView );
   pmView->isCheckable();
 
   pmView->insertItem(  Resource::loadPixmap("fullscreen") , tr( "Full Screen"), mediaPlayerState, SLOT( toggleFullscreen() ) );
 
   Config cfg( "OpiePlayer" );
   bool b= cfg.readBoolEntry("FullScreen", 0);
   mediaPlayerState->setFullscreen(  b );
   pmView->setItemChecked( -16, b );
 
   //    pmView->insertItem(  Resource::loadPixmap("opieplayer/scale") , tr( "Scale"), mediaPlayerState, SLOT(toggleScaled() ) );
 
   pmView->insertSeparator(-1);
 
   skinsMenu = new QPopupMenu( this );
   pmView->insertItem( tr( "Skins" ), skinsMenu );
   skinsMenu->isCheckable();
   populateSkinsMenu();
@@ -397,172 +397,171 @@ void PlayListWidget::clearList() {
   }
 }
 
 
 void PlayListWidget::addAllToList() {
   DocLnkSet filesAll;
   Global::findDocuments(&filesAll, "video/*;audio/*");
   QListIterator<DocLnk> Adit( filesAll.children() );
   for ( ; Adit.current(); ++Adit ) {
     if(QFileInfo(Adit.current()->file()).exists()) {
       d->selectedFiles->addToSelection( **Adit );
     }
   }
 }
 
 
 void PlayListWidget::addAllMusicToList() {
   QListIterator<DocLnk> dit( files.children() );
   for ( ; dit.current(); ++dit ) {
     if(QFileInfo(dit.current()->file()).exists()) {
       d->selectedFiles->addToSelection( **dit );
     }
   }
 }
 
 
 void PlayListWidget::addAllVideoToList() {
   QListIterator<DocLnk> dit( vFiles.children() );
   for ( ; dit.current(); ++dit )
     if(QFileInfo( dit.current()->file()).exists())
       d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
   qDebug(fileref);
   fromSetDocument = TRUE;
   if ( fileref.isNull() ) {
     QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
     return;
   }
 
   if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
     readm3u( fileref);
   } else if(fileref.find("pls",0,TRUE) != -1) { //is pls
     readPls( fileref);
   } else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
     clearList();
     loadList(DocLnk(fileref));
     d->selectedFiles->first();
   } else {
     clearList();
     addToSelection( DocLnk( fileref ) );
     d->setDocumentUsed = TRUE;
     mediaPlayerState->setPlaying( FALSE );
     qApp->processEvents();
     mediaPlayerState->setPlaying( TRUE );
     qApp->processEvents();
     setCaption(tr("OpiePlayer"));
   }
 }
 
 
 void PlayListWidget::setActiveWindow() {
-  qDebug("SETTING active window");
+//  qDebug("SETTING active window");
   // When we get raised we need to ensure that it switches views
   char origView = mediaPlayerState->view();
   mediaPlayerState->setView( 'l' ); // invalidate
   mediaPlayerState->setView( origView ); // now switch back
 }
 
 
 void PlayListWidget::useSelectedDocument() {
   d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() { // this is fugly
 
   switch (tabWidget->currentPageIndex()) {
   case 0: //playlist
     {
-      qDebug("playlist");
+//      qDebug("playlist");
       if ( mediaPlayerState->playlist() ) {
         return d->selectedFiles->current();
       } else if ( d->setDocumentUsed && d->current ) {
         return d->current;
       } else {
         return d->files->selected();
       }
     }
     break;
   case 1://audio
     {
-      qDebug("audioView");
+//      qDebug("audioView");
       QListIterator<DocLnk> dit( files.children() );
       for ( ; dit.current(); ++dit ) {
         if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
-          qDebug("here");
           insanityBool=TRUE;
           return dit;
         }
       }
     }
     break;
   case 2: // video
     {
-      qDebug("videoView");
+//      qDebug("videoView");
       QListIterator<DocLnk> Vdit( vFiles.children() );
       for ( ; Vdit.current(); ++Vdit ) {
         if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
           insanityBool=TRUE;
           return Vdit;
         }
       }
     }
     break;
   };
   return 0;
 }
 
 bool PlayListWidget::prev() {
   if ( mediaPlayerState->playlist() ) {
     if ( mediaPlayerState->shuffled() ) {
       const DocLnk *cur = current();
       int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
       for ( int i = 0; i < j; i++ ) {
         if ( !d->selectedFiles->next() )
           d->selectedFiles->first();
       }
       if ( cur == current() )
         if ( !d->selectedFiles->next() )
           d->selectedFiles->first();
       return TRUE;
     } else {
       if ( !d->selectedFiles->prev() ) {
         if ( mediaPlayerState->looping() ) {
           return d->selectedFiles->last();
         } else {
           return FALSE;
         }
       }
       return TRUE;
     }
   } else {
     return mediaPlayerState->looping();
   }
 }
 
 
 bool PlayListWidget::next() {
   if ( mediaPlayerState->playlist() ) {
     if ( mediaPlayerState->shuffled() ) {
       return prev();
     } else {
       if ( !d->selectedFiles->next() ) {
         if ( mediaPlayerState->looping() ) {
           return d->selectedFiles->first();
         } else {
           return FALSE;
         }
       }
       return TRUE;
     }
   } else {
     return mediaPlayerState->looping();
   }
 }
 
 
 bool PlayListWidget::first() {
   if ( mediaPlayerState->playlist() )
@@ -804,271 +803,269 @@ void PlayListWidget::btnPlay(bool b) {
     {
       addToSelection( videoView->currentItem() );
       mediaPlayerState->setPlaying(b);
       qApp->processEvents();
       d->selectedFiles->removeSelected( );
       tabWidget->setCurrentPage(2);
       d->selectedFiles->unSelect();
       insanityBool=FALSE;
     }//          videoView->clearSelection();
     break;
   };
 
 }
 
 void PlayListWidget::deletePlaylist() {
   switch( QMessageBox::information( this, (tr("Remove Playlist?")),
                                     (tr("You really want to delete\nthis playlist?")),
                                     (tr("Yes")), (tr("No")), 0 )){
   case 0: // Yes clicked,
     QFile().remove(playLists->selected()->file());
     QFile().remove(playLists->selected()->linkFile());
     playLists->reread();
     break;
   case 1: // Cancel
     break;
   };
 }
 
 void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , int) {
   switch (mouse) {
   case 1:
     break;
   case 2:{
     QPopupMenu  m;
     m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
     m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
     m.exec( QCursor::pos() );
   }
     break;
   };
 }
 
 void PlayListWidget::playSelected() {
   btnPlay( TRUE);
 }
 
 void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) {
   switch (mouse) {
   case 1:
 
     break;
   case 2:
     {
       QPopupMenu  m;
       m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
       m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
       m.exec( QCursor::pos() );
     }
     break;
   };
 }
 
 
 void PlayListWidget::scanForAudio() {
-  qDebug("scan for audio");
+//  qDebug("scan for audio");
   files.detachChildren();
   QListIterator<DocLnk> sdit( files.children() );
   for ( ; sdit.current(); ++sdit ) {
     delete sdit.current();
   }
   Global::findDocuments(&files, "audio/*");
   audioScan = TRUE;
 }
 
 void PlayListWidget::scanForVideo() {
-  qDebug("scan for video");
+//  qDebug("scan for video");
   vFiles.detachChildren();
   QListIterator<DocLnk> sdit( vFiles.children() );
   for ( ; sdit.current(); ++sdit ) {
     delete sdit.current();
   }
   Global::findDocuments(&vFiles, "video/*");
   videoScan = TRUE;
 }
 
 void PlayListWidget::populateAudioView() {
 
   audioView->clear();
   StorageInfo storageInfo;
   const QList<FileSystem> &fs = storageInfo.fileSystems();
   if(!audioScan) scanForAudio();
 
   QListIterator<DocLnk> dit( files.children() );
   QListIterator<FileSystem> it ( fs );
 
   QString storage;
   for ( ; dit.current(); ++dit ) {
     for( ; it.current(); ++it ){
       const QString name = (*it)->name();
       const QString path = (*it)->path();
       if(dit.current()->file().find(path) != -1 ) storage=name;
     }
 
     QListViewItem * newItem;
     if ( QFile( dit.current()->file()).exists()  ) {
       // qDebug(dit.current()->name());
       newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
                                              QString::number( QFile( dit.current()->file()).size() ), storage);
       newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/musicfile" ));
     }
   }
 
 }
 
 void PlayListWidget::populateVideoView() {
   videoView->clear();
   StorageInfo storageInfo;
   const QList<FileSystem> &fs = storageInfo.fileSystems();
 
   if(!videoScan ) scanForVideo();
 
   QListIterator<DocLnk> Vdit( vFiles.children() );
   QListIterator<FileSystem> it ( fs );
   videoView->clear();
   QString storage;
   for ( ; Vdit.current(); ++Vdit ) {
     for( ; it.current(); ++it ){
       const QString name = (*it)->name();
       const QString path = (*it)->path();
       if( Vdit.current()->file().find(path) != -1 ) storage=name;
     }
 
     QListViewItem * newItem;
     if ( QFile( Vdit.current()->file()).exists() ) {
       newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
                                              QString::number( QFile( Vdit.current()->file()).size() ), storage);
       newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ));
     }
   }
 }
 
 void PlayListWidget::openFile() {
   QString filename, name;
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
   fileDlg->exec();
   if( fileDlg->result() == 1 ) {
     filename = fileDlg->text();
 
     qDebug("Selected filename is "+filename);
     if(filename.right(3) == "m3u") {
       readm3u( filename );
     } else if(filename.right(3) == "pls") {
       readPls( filename );
     } else {
       DocLnk lnk;
 
       lnk.setName(filename); //sets file name
       lnk.setFile(filename); //sets File property
       lnk.setType("audio/x-mpegurl");
       lnk.setExec("opieplayer");
       lnk.setIcon("opieplayer2/MPEGPlayer");
 
       if(!lnk.writeLink()) {
         qDebug("Writing doclink did not work");
       }
       d->selectedFiles->addToSelection(  lnk);
     }
   }
   if(fileDlg) {
     delete fileDlg;
   }
 }
 
 void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
 {
   switch ( e->key() ) {
     ////////////////////////////// Zaurus keys
   case Key_F9: //activity
     //           if(audioUI->isHidden())
     //             audioUI->showMaximized();
     break;
   case Key_F10: //contacts
     //           if( videoUI->isHidden())
     //             videoUI->showMaximized();
     break;
   case Key_F11: //menu
     break;
   case Key_F12: //home
     //          doBlank();
     break;
   case Key_F13: //mail
     //           doUnblank();
     break;
   case Key_Q: //add to playlist
-    qDebug("Add");
     addSelected();
     break;
   case Key_R: //remove from playlist
     removeSelected();
     break;
     //       case Key_P: //play
     //           qDebug("Play");
     //           playSelected();
     //           break;
   case Key_Space:
-    qDebug("Play");
     //          playSelected(); puh
     break;
   case Key_1:
     tabWidget->setCurrentPage(0);
     break;
   case Key_2:
     tabWidget->setCurrentPage(1);
     break;
   case Key_3:
     tabWidget->setCurrentPage(2);
     break;
   case Key_4:
     tabWidget->setCurrentPage(3);
     break;
   case Key_Down:
     if ( !d->selectedFiles->next() )
       d->selectedFiles->first();
 
     break;
   case Key_Up:
     if ( !d->selectedFiles->prev() )
       //        d->selectedFiles->last();
 
       break;
 
   }
 }
 
 void PlayListWidget::keyPressEvent( QKeyEvent *)
 {
   //    qDebug("Key press");
   //     switch ( e->key() ) {
   // ////////////////////////////// Zaurus keys
   //       case Key_A: //add to playlist
   //           qDebug("Add");
   //           addSelected();
   //           break;
   //       case Key_R: //remove from playlist
   //           removeSelected();
   //           break;
   //       case Key_P: //play
   //           qDebug("Play");
   //           playSelected();
   //           break;
   //       case Key_Space:
   //           qDebug("Play");
   //           playSelected();
   //           break;
   //     }
 }
 
 
 
 void PlayListWidget::readm3u(const QString &filename) {
 
   qDebug("m3u filename is "+filename);
   QFile f(filename);
 
   if(f.open(IO_ReadOnly)) {
     QTextStream t(&f);
     QString s;//, first, second;
     int i=0;
     while ( !t.atEnd()) {
       s=t.readLine();
@@ -1136,118 +1133,118 @@ void PlayListWidget::writem3u() {
     while ( d->selectedFiles->next() );
     qDebug(list);
     if(filename.left(1) != "/")
       filename=QPEApplication::documentDir()+"/"+filename;
     if(filename.right(3) != "m3u")
       filename=filename+".m3u";
 
     QFile f(filename);
     f.open(IO_WriteOnly);
     f.writeBlock(list, list.length());
     f.close();
   }
   if(fileDlg) delete fileDlg;
 }
 
 void PlayListWidget::readPls(const QString &filename) {
 
   qDebug("pls filename is "+filename);
   QFile f(filename);
 
   if(f.open(IO_ReadOnly)) {
     QTextStream t(&f);
     QString s;//, first, second;
     int i=0;
     while ( !t.atEnd()) {
       s=t.readLine();
       if(s.left(4) == "File") {
         s=s.right(s.length() - 6);
         s.replace(QRegExp("%20")," ");
         qDebug("adding "+s+" to playlist");
         // numberofentries=2
         // File1=http
         // Title
         // Length
         // Version
         // File2=http
         s=s.replace( QRegExp("\\"),"/");
         DocLnk lnk( s );
         QFileInfo f(s);
         QString name = f.baseName();
         if(name.left(4)=="http")
           name = s.right( s.length() - 7);
         else
           name=s;
         name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
         lnk.setName( name);
         if(s.at(s.length()-4) == '.') // if this is probably a file
           lnk.setFile( s);
         else { //if its a url
           if( name.right(1).find('/') == -1)
             s+="/";
           lnk.setFile( s);
         }
         lnk.setType("audio/x-mpegurl");
 
         qDebug("DocLnk add "+name);
         d->selectedFiles->addToSelection( lnk);
       }
     }
     i++;
   }
 }
 
 void PlayListWidget::pmViewActivated(int index) {
-  qDebug("%d", index);
+//  qDebug("%d", index);
   switch(index) {
   case -16:
     {
 
       mediaPlayerState->toggleFullscreen();
       bool b=mediaPlayerState->fullscreen();
       pmView->setItemChecked( index,b);
       Config cfg( "OpiePlayer" );
       cfg.writeEntry("FullScreen", b);
 
     }
     break;
   };
 }
 
 void PlayListWidget::populateSkinsMenu() {
   int item=0;
   defaultSkinIndex=0;
   QString skinName;
   Config cfg( "OpiePlayer" );
   cfg.setGroup("Options");
   QString skin = cfg.readEntry("Skin","default");
 
   QDir skinsDir(QPEApplication::qpeDir()+"/pics/opieplayer2/skins");
   skinsDir.setFilter( QDir::Dirs);
   skinsDir.setSorting(QDir::Name);
   const QFileInfoList *skinslist = skinsDir.entryInfoList();
   QFileInfoListIterator it( *skinslist );
   QFileInfo *fi;
   while ( (fi=it.current()) ) {
     skinName =  fi->fileName();
     qDebug(  fi->fileName());
     if( skinName != "." &&  skinName != ".." && skinName !="CVS")
       item = skinsMenu->insertItem( fi->fileName());
     if( skinName == "default")
       defaultSkinIndex = item;
     if( skinName == skin)
       skinsMenu->setItemChecked( item, TRUE);
 
     ++it;
   }
 }
 
 void PlayListWidget::skinsMenuActivated(int item) {
   for(int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) {
     skinsMenu->setItemChecked( i, FALSE);
   }
   skinsMenu->setItemChecked( item, TRUE);
 
   Config cfg( "OpiePlayer" );
   cfg.setGroup("Options");
   cfg.writeEntry("Skin", skinsMenu->text( item));
 }