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
@@ -79,49 +79,49 @@ public:
 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 );
@@ -437,92 +437,91 @@ void PlayListWidget::setDocument(const QString& fileref) {
   }
 
   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() )
@@ -844,60 +843,60 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , in
 }
 
 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();
@@ -975,60 +974,58 @@ void PlayListWidget::openFile() {
   }
 }
 
 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;
@@ -1176,49 +1173,49 @@ void PlayListWidget::readPls(const QString &filename) {
         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");