convert to Opie Debugging Framework

10 files changed, 67 insertions, 67 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 28a42eb..36def67 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -134,5 +134,5 @@ void AudioWidget::sliderReleased() {
 
 void AudioWidget::setPosition( long i ) {
-    //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
+    //    odebug << "<<<<<<<<<<<<<<<<<<<<<<<<set position " << i << "" << oendl; 
     updateSlider( i, mediaPlayerState.length() );
 }
@@ -188,5 +188,5 @@ void AudioWidget::setSeekable( bool isSeekable ) {
 
     if ( !isSeekable ) {
-        qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
+        odebug << "<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>" << oendl; 
         if( !slider.isHidden()) {
             slider.hide();
@@ -200,5 +200,5 @@ void AudioWidget::setSeekable( bool isSeekable ) {
         // does not stop stream when it reaches the end
         slider.show();
-        qDebug( " CONNECT SET POSTION " );
+        odebug << " CONNECT SET POSTION " << oendl; 
         connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
@@ -272,5 +272,5 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
       case Key_F9: //activity
            hide();
-           //           qDebug("Audio F9");
+           //           odebug << "Audio F9" << oendl; 
            e->accept();
           break;
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index a42b8e5..5c24dbe 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -107,8 +107,8 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
 void Lib::run()
 {
-    qDebug( "Lib::run() started" );
+    odebug << "Lib::run() started" << oendl; 
     initialize();
     m_initialized = true;
-    qDebug( "Lib::run() finished" );
+    odebug << "Lib::run() finished" << oendl; 
 }
 
@@ -216,5 +216,5 @@ void Lib::stop() {
     assert( m_initialized );
 
-    qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
+    odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl; 
     xine_stop( m_stream );
 }
@@ -328,7 +328,7 @@ void Lib::ensureInitialized()
         return;
 
-    qDebug( "waiting for initialization thread to finish" );
+    odebug << "waiting for initialization thread to finish" << oendl; 
     wait();
-    qDebug( "initialization thread finished!" );
+    odebug << "initialization thread finished!" << oendl; 
 }
 
@@ -423,5 +423,5 @@ void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
 
     if ( !m_video ) {
-        qWarning("not showing video now");
+        owarn << "not showing video now" << oendl; 
         return;
     }
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index a236775..7e38fc7 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -153,5 +153,5 @@ void MediaPlayer::next() {
         }
     } else { //if playing from file list, let's just stop
-        qDebug("<<<<<<<<<<<<<<<<<stop for filelists");
+        odebug << "<<<<<<<<<<<<<<<<<stop for filelists" << oendl; 
         mediaPlayerState.setPlaying(false);
         mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection );
@@ -286,5 +286,5 @@ void MediaPlayer::blank( bool b ) {
     if (fd != -1) {
         if ( b ) {
-            qDebug("do blanking");
+            odebug << "do blanking" << oendl; 
 #ifdef QT_QWS_SL5XXX
             ioctl( fd, FBIOBLANK, 1 );
@@ -298,5 +298,5 @@ void MediaPlayer::blank( bool b ) {
             isBlanked = TRUE;
         } else {
-            qDebug("do unblanking");
+            odebug << "do unblanking" << oendl; 
             ioctl( fd, FBIOBLANK, 0);
 #ifdef QT_QWS_SL5XXX
@@ -310,5 +310,5 @@ void MediaPlayer::blank( bool b ) {
         close( fd );
     } else {
-        qDebug("<< /dev/fb0 could not be opened  >>");
+        odebug << "<< /dev/fb0 could not be opened  >>" << oendl; 
     }
 }
@@ -326,9 +326,9 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
           break;
       case Key_F12: //home
-          qDebug("Blank here");
+          odebug << "Blank here" << oendl; 
 //          mediaPlayerState->toggleBlank();
           break;
       case Key_F13: //mail
-          qDebug("Blank here");
+          odebug << "Blank here" << oendl; 
           //  mediaPlayerState->toggleBlank();
           break;
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 26d5e15..95dbab5 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -38,5 +38,5 @@
 Om3u::Om3u( const QString &filePath, int mode)
       : QStringList (){
-qDebug("<<<<<<<new m3u "+filePath);
+odebug << "<<<<<<<new m3u "+filePath << oendl; 
   f.setName(filePath);
   f.open(mode);
@@ -46,5 +46,5 @@ Om3u::~Om3u(){}
 
 void Om3u::readM3u() {
-//    qDebug("<<<<<<reading m3u "+f.name());
+//    odebug << "<<<<<<reading m3u "+f.name() << oendl; 
     QTextStream t(&f);
 		t.setEncoding(QTextStream::UnicodeUTF8);
@@ -52,5 +52,5 @@ void Om3u::readM3u() {
     while ( !t.atEnd() ) {
         s=t.readLine();
-//                qDebug(s);
+//                odebug << s << oendl; 
         if( s.find( "#", 0, TRUE) == -1 ) {
                 if( s.left(2) == "E:" || s.left(2) == "P:" ) {
@@ -61,5 +61,5 @@ void Om3u::readM3u() {
                     s=s.replace( QRegExp( "\\" ), "/" );
                     append(s);
-//                    qDebug(s);
+//                    odebug << s << oendl; 
                 } else { // is url
                     QString name;
@@ -81,5 +81,5 @@ void Om3u::readPls() { //it's a pls file
                 s = s.stripWhiteSpace();
                 s.replace( QRegExp( "%20" )," ");
-//                qDebug( "adding " + s + " to playlist" );
+//                odebug << "adding " + s + " to playlist" << oendl; 
                 // numberofentries=2
                 // File1=http
@@ -115,5 +115,5 @@ void Om3u::write() { //writes list to m3u file
  if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
-//      qDebug(*it);
+//      odebug << *it << oendl; 
 				t << *it << "\n";
     }
@@ -131,5 +131,5 @@ void Om3u::remove(const QString &filePath) { //removes from m3u list
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
       currentFile=*it;
-      //        qDebug(*it);
+      //        odebug << *it << oendl; 
 
       if( filePath != currentFile)
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp
index 015896f..3499837 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.cpp
+++ b/noncore/multimedia/opieplayer2/playlistselection.cpp
@@ -45,5 +45,5 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     : QListView( parent, name )
 {
-//    qDebug("starting playlistselector");
+//    odebug << "starting playlistselector" << oendl; 
 // #ifdef USE_PLAYLIST_BACKGROUND
 //    setStaticBackground( TRUE );
@@ -66,5 +66,5 @@ PlayListSelection::~PlayListSelection() {
 // #ifdef USE_PLAYLIST_BACKGROUND
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
-//  qDebug("drawBackground");
+//  odebug << "drawBackground" << oendl; 
    p->fillRect( r, QBrush( white ) );
 //        QImage logo = Resource::loadImage( "launcher/opielogo" );
@@ -185,5 +185,5 @@ void PlayListSelection::writeCurrent( Config& cfg ) {
     if ( item )
         cfg.writeEntry("current", item->text(0) );
-    qDebug(item->text(0));
+    odebug << item->text(0) << oendl; 
 
 }
@@ -194,7 +194,7 @@ void  PlayListSelection::setSelectedItem(const QString &strk ) {
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it ) {
-//        qDebug( it.current()->text(0));
+//        odebug << it.current()->text(0) << oendl; 
         if( strk == it.current()->text(0)) {
-//             qDebug( "We have a match "+strk);
+//             odebug << "We have a match "+strk << oendl; 
             setSelected( it.current(), TRUE);
             ensureItemVisible( it.current() );
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 4460833..956d206 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -183,9 +183,9 @@ void PlayListWidget::writeDefaultPlaylist() {
     if( currentString == filename) {
       Om3u *m3uList;
-      //    qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>");
+      //    odebug << "<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>" << oendl; 
       if( d->selectedFiles->first() ) {
         m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate);
         do {
-          //        qDebug(d->selectedFiles->current()->file());
+          //        odebug << d->selectedFiles->current()->file() << oendl; 
           m3uList->add( d->selectedFiles->current()->file() );
         }
@@ -326,5 +326,5 @@ void PlayListWidget::addAllVideoToList() {
 
 void PlayListWidget::setDocument( const QString& fileref ) {
-  //    qDebug( "<<<<<<<<set document>>>>>>>>>> "+fileref );
+  //    odebug << "<<<<<<<<set document>>>>>>>>>> "+fileref << oendl; 
     fromSetDocument = TRUE;
     QFileInfo fileInfo(fileref);
@@ -402,5 +402,5 @@ bool PlayListWidget::prev() {
 
 bool PlayListWidget::next() {
-//qDebug("<<<<<<<<<<<<next()");
+//odebug << "<<<<<<<<<<<<next()" << oendl; 
     if ( mediaPlayerState->isShuffled() ) {
         return prev();
@@ -613,5 +613,5 @@ void PlayListWidget::openURL() {
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->text();
-        qDebug( "Selected filename is " + filename );
+        odebug << "Selected filename is " + filename << oendl; 
         //            Om3u *m3uList;
             DocLnk lnk;
@@ -689,5 +689,5 @@ void PlayListWidget::openFile() {
     if( !str.isEmpty() ) {
 
-        qDebug( "Selected filename is " + str );
+        odebug << "Selected filename is " + str << oendl; 
         filename = str;
         DocLnk lnk;
@@ -707,5 +707,5 @@ void PlayListWidget::openFile() {
 
 void PlayListWidget::readListFromFile( const QString &filename ) {
-    qDebug( "read list filename " + filename );
+    odebug << "read list filename " + filename << oendl; 
     QFileInfo fi(filename);
     Om3u *m3uList;
@@ -720,5 +720,5 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
         s = *it;
-        //        qDebug(s);
+        //        odebug << s << oendl; 
         if(s.left(4)=="http") {
           lnk.setName( s ); //sets file name
@@ -754,5 +754,5 @@ void PlayListWidget::readListFromFile( 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");
@@ -764,9 +764,9 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
 
        do {
-           //      qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file());
+           //      odebug << "add writeCurrentM3u " +d->selectedFiles->current()->file() << oendl; 
            m3uList->add( d->selectedFiles->current()->file() );
        }
        while ( d->selectedFiles->next() );
-       //    qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
+       //    odebug << "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" << oendl; 
        m3uList->write();
       m3uList->close();
@@ -813,5 +813,5 @@ void PlayListWidget::writem3u() {
         name = str;
         //       name = fileDlg->text();
-//        qDebug( filename );
+//        odebug << filename << oendl; 
         if( name.find("/",0,true) != -1) {// assume they specify a file path
             filename = name;
@@ -831,5 +831,5 @@ void PlayListWidget::writem3u() {
           }
           while ( d->selectedFiles->next() );
-          //    qDebug( list );
+          //    odebug << list << oendl; 
           m3uList->write();
           m3uList->close();
@@ -843,5 +843,5 @@ void PlayListWidget::writem3u() {
           lnk.setName( name); //sets file name
 
-          // qDebug(filename);
+          // odebug << filename << oendl; 
           Config config( "OpiePlayer" );
           config.setGroup( "PlayList" );
@@ -851,5 +851,5 @@ void PlayListWidget::writem3u() {
 
           if(!lnk.writeLink()) {
-            qDebug("Writing doclink did not work");
+            odebug << "Writing doclink did not work" << oendl; 
           }
 
@@ -885,5 +885,5 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
     break;
     //       case Key_P: //play
-    //           qDebug("Play");
+    //           odebug << "Play" << oendl; 
     //           playSelected();
     //           break;
@@ -915,5 +915,5 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
 
 void PlayListWidget::pmViewActivated(int index) {
-//  qDebug("%d", index);
+//  odebug << "" << index << "" << oendl; 
     switch(index) {
     case -16:
@@ -945,5 +945,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() ) ;
@@ -1001,5 +1001,5 @@ QString PlayListWidget::currentFileListPathName() const {
 
 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
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 2ff190d..922f9d7 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -184,5 +184,5 @@ void PlayListWidgetGui::setView( char view )  {
 
 void PlayListWidgetGui::setActiveWindow()  {
-    //  qDebug("SETTING active window");
+    //  odebug << "SETTING active window" << oendl; 
     // When we get raised we need to ensure that it switches views
     MediaPlayerState::DisplayType origDisplayType = mediaPlayerState->displayType();
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 7c38983..84f5f87 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -179,9 +179,9 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file
         data = new SkinData;
     else
-        qDebug( "SkinCache: hit" );
+        odebug << "SkinCache: hit" << oendl; 
 
     QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath );
     if ( bgPixmap ) {
-        qDebug( "SkinCache: hit on bgpixmap" );
+        odebug << "SkinCache: hit on bgpixmap" << oendl; 
         data->backgroundPixmap = *bgPixmap;
     }
@@ -219,15 +219,15 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
     switch ( m_currentState ) {
         case LoadBackgroundPixmap:
-            qDebug( "load bgpixmap" );
+            odebug << "load bgpixmap" << oendl; 
             m_skin.backgroundPixmap();
             m_currentState = LoadButtonUpImage;
             break;
         case LoadButtonUpImage:
-            qDebug( "load upimage" );
+            odebug << "load upimage" << oendl; 
             m_skin.buttonUpImage();
             m_currentState = LoadButtonDownImage;
             break;
         case LoadButtonDownImage:
-            qDebug( "load downimage" );
+            odebug << "load downimage" << oendl; 
             m_skin.buttonDownImage();
             m_currentState = LoadButtonMasks;
@@ -235,5 +235,5 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
             break;
         case LoadButtonMasks:
-            qDebug( "load button masks %i", m_currentButton );
+            odebug << "load button masks " << m_currentButton << "" << oendl; 
             m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName );
 
@@ -244,5 +244,5 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
             break;
         case LoadButtonMask:
-            qDebug( "load whole mask" );
+            odebug << "load whole mask" << oendl; 
             m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount );
             return LoadingCompleted;
@@ -259,5 +259,5 @@ SkinLoader::SkinLoader()
 SkinLoader::~SkinLoader()
 {
-    qDebug( "SkinLoader::~SkinLoader()" );
+    odebug << "SkinLoader::~SkinLoader()" << oendl; 
     killTimers();
     delete m_currentLoader;
@@ -278,5 +278,5 @@ void SkinLoader::start()
     assert( m_timerId == -1 );
     m_timerId = startTimer( 100 /* ms */ );
-    qDebug( "SkinLoader::start() %d jobs", pendingSkins.count() );
+    odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; 
 }
 
@@ -291,5 +291,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
 
         if ( pendingSkins.isEmpty() ) {
-            qDebug( "all jobs done" );
+            odebug << "all jobs done" << oendl; 
             killTimer( m_timerId );
             m_timerId = -1;
@@ -303,5 +303,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
 
         m_currentLoader = new IncrementalLoader( nfo );
-        qDebug( "new loader %i jobs left", pendingSkins.count() );
+        odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl; 
     }
 
@@ -311,5 +311,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
     }
 
-    qDebug( "finished step" );
+    odebug << "finished step" << oendl; 
 }
 
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp
index fb951b4..d8b8abe 100644
--- a/noncore/multimedia/opieplayer2/threadutil.cpp
+++ b/noncore/multimedia/opieplayer2/threadutil.cpp
@@ -188,5 +188,5 @@ void Thread::start()
 
     if ( d->isRunning ) {
-        qDebug( "ThreadUtil::Thread::start() called for running thread." );
+        odebug << "ThreadUtil::Thread::start() called for running thread." << oendl; 
         return;
     }
@@ -197,5 +197,5 @@ void Thread::start()
     int err = pthread_create( &d->self, &attributes, start_thread, ( void* )d );
     if ( err != 0 ) {
-        qDebug( "ThreadUtil::Thread::start() : can't create thread: %s", strerror( err ) );
+        odebug << "ThreadUtil::Thread::start() : can't create thread: " << strerror( err ) << "" << oendl; 
         pthread_attr_destroy( &attributes );
         return;
@@ -285,5 +285,5 @@ void ChannelMessage::reply()
     if ( !m_isCall )
     {
-        qDebug( "ChannelMessage::reply() - can't reply oneway message!" );
+        odebug << "ChannelMessage::reply() - can't reply oneway message!" << oendl; 
         return;
     }
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 8f11b2e..94f99f8 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -94,5 +94,5 @@ void XineControl::play( const QString& fileName ) {
     m_fileName = fileName;
 
-    qDebug("<<FILENAME: " + fileName  + ">>>>");
+    odebug << "<<FILENAME: " + fileName  + ">>>>" << oendl; 
 
     if ( !libXine->play( fileName, 0, 0 ) ) {
@@ -107,10 +107,10 @@ void XineControl::play( const QString& fileName ) {
     if ( !libXine->hasVideo() ) {
         displayType = MediaPlayerState::Audio;
-        qDebug("HAS AUDIO");
+        odebug << "HAS AUDIO" << oendl; 
         libXine->setShowVideo( false );
         hasAudioChannel = TRUE;
     } else {
         displayType = MediaPlayerState::Video;
-        qDebug("HAS VIDEO");
+        odebug << "HAS VIDEO" << oendl; 
         libXine->setShowVideo( true );
         hasVideoChannel = TRUE;
@@ -244,5 +244,5 @@ QString XineControl::getErrorCode() {
     int errorCode = libXine->error();
 
-    qDebug( QString("ERRORCODE: %1 ").arg(errorCode) );
+    odebug << QString("ERRORCODE: %1 ").arg(errorCode) << oendl; 
 
     if ( errorCode == 1 ) {