1 files changed, 46 insertions, 44 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
@@ -21,23 +21,25 @@
 #define QTOPIA_INTERNAL_FSLP
 
-#include <qtoolbar.h>
+#include "playlistselection.h"
+#include "playlistwidget.h"
+#include "mediaplayerstate.h"
+#include "inputDialog.h"
+#include "audiowidget.h"
+#include "videowidget.h"
+
+/* OPIE */
 #include <qpe/qpemenubar.h>
 #include <qpe/lnkproperties.h>
+#include <opie2/odebug.h>
 
+/* QT */
+#include <qtoolbar.h>
 #include <qaction.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
-
 //#include <qtimer.h>
 
-#include "playlistselection.h"
-#include "playlistwidget.h"
-#include "mediaplayerstate.h"
-
-#include "inputDialog.h"
-
+/* STD */
 #include <stdlib.h>
-#include "audiowidget.h"
-#include "videowidget.h"
 
 #include <unistd.h>
@@ -390,5 +392,5 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
             QString entryName;
             entryName.sprintf( "File%i", noOfFiles + 1 );
-//            qDebug(entryName);
+//            odebug << entryName << oendl;
             cfg.writeEntry( entryName, lnk->linkFile() );
               // if this link does exist, add it so we have the file
@@ -484,5 +486,5 @@ void PlayListWidget::setDocument(const QString& fileref) {
 
 void PlayListWidget::setDocumentEx(const QString& fileref) {
-   qDebug("opieplayer receive "+fileref);
+   odebug << "opieplayer receive "+fileref << oendl;
    clearList();
    DocLnk lnk;
@@ -493,5 +495,5 @@ void PlayListWidget::setDocumentEx(const QString& fileref) {
       return;
    }
-   //   qDebug("<<<<<<<<<<<<<<<<<<<<<<setDocument "+fileref);
+   //   odebug << "<<<<<<<<<<<<<<<<<<<<<<setDocument "+fileref << oendl;
    QString extension = fileInfo.extension(false);
      if( extension.find( "m3u", 0, false) != -1) { //is m3u
@@ -535,5 +537,5 @@ void PlayListWidget::setDocumentEx(const QString& fileref) {
 
 void PlayListWidget::setActiveWindow() {
-   //        qDebug("SETTING active window");
+   //        odebug << "SETTING active window" << oendl;
       // When we get raised we need to ensure that it switches views
     char origView = mediaPlayerState->view();
@@ -552,5 +554,5 @@ const DocLnk *PlayListWidget::current() { // this is fugly
    case 0: //playlist
    {
-      //          qDebug("playlist");
+      //          odebug << "playlist" << oendl;
       if ( mediaPlayerState->playlist() ) {
          return d->selectedFiles->current();
@@ -565,5 +567,5 @@ const DocLnk *PlayListWidget::current() { // this is fugly
    case 1://audio
    {
-      //          qDebug("audioView");
+      //          odebug << "audioView" << oendl;
       QListIterator<DocLnk> dit( files.children() );
       for ( ; dit.current(); ++dit ) {
@@ -661,9 +663,9 @@ void PlayListWidget::saveList() {
 void PlayListWidget::loadList( const DocLnk & lnk) {
    QString name = lnk.name();
-   //  qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
+   //  odebug << "<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name << oendl;
 
    if( name.length()>0) {
       setCaption("OpiePlayer: "+name);
-      //       qDebug("<<<<<<<<<<<<load list "+ lnk.file());
+      //       odebug << "<<<<<<<<<<<<load list "+ lnk.file() << oendl;
       clearList();
       readm3u(lnk.file());
@@ -819,5 +821,5 @@ void PlayListWidget::btnPlay(bool b) {
       mediaPlayerState->setPlaying(b);
       insanityBool=FALSE;
-      qDebug("insanity");              
+      odebug << "insanity" << oendl;
       //          }
    }
@@ -952,5 +954,5 @@ void PlayListWidget::listDelete() {
 
 void PlayListWidget::scanForAudio() {
-   //    qDebug("scan for audio");
+   //    odebug << "scan for audio" << oendl;
    files.detachChildren();
    QListIterator<DocLnk> sdit( files.children() );
@@ -962,5 +964,5 @@ void PlayListWidget::scanForAudio() {
 }
 void PlayListWidget::scanForVideo() {
-   //    qDebug("scan for video");
+   //    odebug << "scan for video" << oendl;
    vFiles.detachChildren();
    QListIterator<DocLnk> sdit( vFiles.children() );
@@ -997,5 +999,5 @@ void PlayListWidget::populateAudioView() {
          else 
             size = QFile( dit.current()->file() ).size();
-         //            qDebug(dit.current()->name());
+         //            odebug << dit.current()->name() << oendl;
          newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
                                                 QString::number(size ), storage, dit.current()->file());
@@ -1041,5 +1043,5 @@ void PlayListWidget::openFile() {
    if( fileDlg->result() == 1 ) {
       filename = fileDlg->text();
-      //        qDebug( "Selected filename is " + filename );
+      //        odebug << "Selected filename is " + filename << oendl;
       DocLnk lnk;
       Config cfg( "OpiePlayer" );
@@ -1086,5 +1088,5 @@ void PlayListWidget::openFile() {
 reads m3u and shows files/urls to playlist widget */
 void PlayListWidget::readm3u( const QString &filename ) { 
-   //    qDebug( "read m3u filename " + filename );
+   //    odebug << "read m3u filename " + filename << oendl;
 
    Om3u *m3uList;
@@ -1095,5 +1097,5 @@ void PlayListWidget::readm3u( const QString &filename ) {
    for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
       s = *it;
-      //          qDebug("reading "+ s);
+      //          odebug << "reading "+ s << oendl;
       if(s.left(4)=="http") {
          lnk.setName( s ); //sets file name
@@ -1112,9 +1114,9 @@ void PlayListWidget::readm3u( const QString &filename ) {
          //                 if(s.right(4) == '.')   {//if regular file
          if(s.left(1) != "/")  { 
-            //            qDebug("set link "+QFileInfo(filename).dirPath()+"/"+s);
+            //            odebug << "set link "+QFileInfo(filename).dirPath()+"/"+s << oendl;
             lnk.setFile( QFileInfo(filename).dirPath()+"/"+s);
             lnk.setIcon("SoundPlayer");
          } else {
-            //            qDebug("set link2 "+s);
+            //            odebug << "set link2 "+s << oendl;
             lnk.setFile( s);
             lnk.setIcon("SoundPlayer");
@@ -1143,5 +1145,5 @@ reads pls and adds files/urls to playlist  */
 void PlayListWidget::readPls( const QString &filename ) {
 
-   //    qDebug( "pls filename is " + filename );
+   //    odebug << "pls filename is " + filename << oendl;
    Om3u *m3uList;
    QString s, name;
@@ -1186,5 +1188,5 @@ void PlayListWidget::readPls( const QString &filename ) {
  writes current playlist to current m3u file */
 void PlayListWidget::writeCurrentM3u() {
-   //  qDebug("writing to current m3u");
+   //  odebug << "writing to current m3u" << oendl;
   Config cfg( "OpiePlayer" );
   cfg.setGroup("PlayList");
@@ -1195,9 +1197,9 @@ void PlayListWidget::writeCurrentM3u() {
   if( d->selectedFiles->first()) {
   do {
-     //      qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file());
+     //      odebug << "writeCurrentM3u " +d->selectedFiles->current()->file() << oendl;
     m3uList->add( d->selectedFiles->current()->file() );
   }
   while ( d->selectedFiles->next() );
-  //    qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
+  //    odebug << "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" << oendl;
   m3uList->write();
   m3uList->close();
@@ -1218,5 +1220,5 @@ void PlayListWidget::writem3u() {
    if( fileDlg->result() == 1 ) {
       name = fileDlg->text();
-      //        qDebug( filename );
+      //        odebug << filename << oendl;
       if( name.find("/",0,true) != -1) {// assume they specify a file path
          filename = name;
@@ -1236,5 +1238,5 @@ void PlayListWidget::writem3u() {
          }
          while ( d->selectedFiles->next() );
-         //    qDebug( list );
+         //    odebug << list << oendl;
          m3uList->write();
          m3uList->close();
@@ -1248,5 +1250,5 @@ void PlayListWidget::writem3u() {
          lnk.setName( name); //sets file name
 
-         // qDebug(filename);
+         // odebug << filename << oendl;
          Config config( "OpiePlayer" );
          config.setGroup( "PlayList" );
@@ -1256,5 +1258,5 @@ void PlayListWidget::writem3u() {
 
          if(!lnk.writeLink()) {
-            //            qDebug("Writing doclink did not work");
+            //            odebug << "Writing doclink did not work" << oendl;
          }
 
@@ -1292,5 +1294,5 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
           break;
 //       case Key_P: //play
-//           qDebug("Play");
+//           odebug << "Play" << oendl;
 //           playSelected();
 //           break;
@@ -1326,9 +1328,9 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
 void PlayListWidget::keyPressEvent( QKeyEvent *)
 {
-//    qDebug("Key press");
+//    odebug << "Key press" << oendl;
 //     switch ( e->key() ) {
 // ////////////////////////////// Zaurus keys
 //       case Key_A: //add to playlist
-//           qDebug("Add");
+//           odebug << "Add" << oendl;
 //           addSelected();
 //           break;
@@ -1337,9 +1339,9 @@ void PlayListWidget::keyPressEvent( QKeyEvent *)
 //           break;
 //       case Key_P: //play
-//           qDebug("Play");
+//           odebug << "Play" << oendl;
 //           playSelected();
 //           break;
 //       case Key_Space:
-//           qDebug("Play");
+//           odebug << "Play" << oendl;
 //           playSelected();
 //           break;
@@ -1348,5 +1350,5 @@ void PlayListWidget::keyPressEvent( QKeyEvent *)
 
 void PlayListWidget::doBlank() {
-   //    qDebug("do blanking");
+   //    odebug << "do blanking" << oendl;
 #ifdef QT_QWS_DEVFS
    fd=open("/dev/fb/0",O_RDWR);
@@ -1364,5 +1366,5 @@ void PlayListWidget::doUnblank() {
    //      int fd;
    //       fd=open("/dev/fb0",O_RDWR);
-   //    qDebug("do unblanking");
+   //    odebug << "do unblanking" << oendl;
    if (fd != -1) {
       ioctl(fd,FBIOBLANK,0);
@@ -1389,5 +1391,5 @@ void PlayListWidget::populateSkinsMenu() {
    while ( ( fi = it.current() ) ) {
       skinName =  fi->fileName();
-      //        qDebug(  fi->fileName() );
+      //        odebug << fi->fileName() << oendl;
       if( skinName != "." &&  skinName != ".." && skinName !="CVS" )  {
          item = skinsMenu->insertItem( fi->fileName() ) ;
@@ -1415,5 +1417,5 @@ void PlayListWidget::skinsMenuActivated( int item ) {
 
 void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
-   //   qDebug("qcop message "+msg );
+   //   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "play()" ) { //plays current selection