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
@@ -135,3 +135,3 @@ void AudioWidget::sliderReleased() {
 void AudioWidget::setPosition( long i ) {
-    //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
+    //    odebug << "<<<<<<<<<<<<<<<<<<<<<<<<set position " << i << "" << oendl; 
     updateSlider( i, mediaPlayerState.length() );
@@ -189,3 +189,3 @@ void AudioWidget::setSeekable( bool isSeekable ) {
     if ( !isSeekable ) {
-        qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
+        odebug << "<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>" << oendl; 
         if( !slider.isHidden()) {
@@ -201,3 +201,3 @@ void AudioWidget::setSeekable( bool isSeekable ) {
         slider.show();
-        qDebug( " CONNECT SET POSTION " );
+        odebug << " CONNECT SET POSTION " << oendl; 
         connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
@@ -273,3 +273,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
            hide();
-           //           qDebug("Audio F9");
+           //           odebug << "Audio F9" << oendl; 
            e->accept();
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
@@ -108,6 +108,6 @@ 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; 
 }
@@ -217,3 +217,3 @@ void Lib::stop() {
 
-    qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
+    odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl; 
     xine_stop( m_stream );
@@ -329,5 +329,5 @@ void Lib::ensureInitialized()
 
-    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; 
 }
@@ -424,3 +424,3 @@ 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
@@ -154,3 +154,3 @@ 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);
@@ -287,3 +287,3 @@ void MediaPlayer::blank( bool b ) {
         if ( b ) {
-            qDebug("do blanking");
+            odebug << "do blanking" << oendl; 
 #ifdef QT_QWS_SL5XXX
@@ -299,3 +299,3 @@ void MediaPlayer::blank( bool b ) {
         } else {
-            qDebug("do unblanking");
+            odebug << "do unblanking" << oendl; 
             ioctl( fd, FBIOBLANK, 0);
@@ -311,3 +311,3 @@ void MediaPlayer::blank( bool b ) {
     } else {
-        qDebug("<< /dev/fb0 could not be opened  >>");
+        odebug << "<< /dev/fb0 could not be opened  >>" << oendl; 
     }
@@ -327,3 +327,3 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
       case Key_F12: //home
-          qDebug("Blank here");
+          odebug << "Blank here" << oendl; 
 //          mediaPlayerState->toggleBlank();
@@ -331,3 +331,3 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
       case Key_F13: //mail
-          qDebug("Blank here");
+          odebug << "Blank here" << oendl; 
           //  mediaPlayerState->toggleBlank();
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
@@ -39,3 +39,3 @@ Om3u::Om3u( const QString &filePath, int mode)
       : QStringList (){
-qDebug("<<<<<<<new m3u "+filePath);
+odebug << "<<<<<<<new m3u "+filePath << oendl; 
   f.setName(filePath);
@@ -47,3 +47,3 @@ Om3u::~Om3u(){}
 void Om3u::readM3u() {
-//    qDebug("<<<<<<reading m3u "+f.name());
+//    odebug << "<<<<<<reading m3u "+f.name() << oendl; 
     QTextStream t(&f);
@@ -53,3 +53,3 @@ void Om3u::readM3u() {
         s=t.readLine();
-//                qDebug(s);
+//                odebug << s << oendl; 
         if( s.find( "#", 0, TRUE) == -1 ) {
@@ -62,3 +62,3 @@ void Om3u::readM3u() {
                     append(s);
-//                    qDebug(s);
+//                    odebug << s << oendl; 
                 } else { // is url
@@ -82,3 +82,3 @@ void Om3u::readPls() { //it's a pls file
                 s.replace( QRegExp( "%20" )," ");
-//                qDebug( "adding " + s + " to playlist" );
+//                odebug << "adding " + s + " to playlist" << oendl; 
                 // numberofentries=2
@@ -116,3 +116,3 @@ void Om3u::write() { //writes list to m3u file
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
-//      qDebug(*it);
+//      odebug << *it << oendl; 
                                 t << *it << "\n";
@@ -132,3 +132,3 @@ void Om3u::remove(const QString &filePath) { //removes from m3u list
       currentFile=*it;
-      //        qDebug(*it);
+      //        odebug << *it << oendl; 
 
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
@@ -46,3 +46,3 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
 {
-//    qDebug("starting playlistselector");
+//    odebug << "starting playlistselector" << oendl; 
 // #ifdef USE_PLAYLIST_BACKGROUND
@@ -67,3 +67,3 @@ PlayListSelection::~PlayListSelection() {
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
-//  qDebug("drawBackground");
+//  odebug << "drawBackground" << oendl; 
    p->fillRect( r, QBrush( white ) );
@@ -186,3 +186,3 @@ void PlayListSelection::writeCurrent( Config& cfg ) {
         cfg.writeEntry("current", item->text(0) );
-    qDebug(item->text(0));
+    odebug << item->text(0) << oendl; 
 
@@ -195,5 +195,5 @@ void  PlayListSelection::setSelectedItem(const QString &strk ) {
     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);
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
@@ -184,3 +184,3 @@ void PlayListWidget::writeDefaultPlaylist() {
       Om3u *m3uList;
-      //    qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>");
+      //    odebug << "<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>" << oendl; 
       if( d->selectedFiles->first() ) {
@@ -188,3 +188,3 @@ void PlayListWidget::writeDefaultPlaylist() {
         do {
-          //        qDebug(d->selectedFiles->current()->file());
+          //        odebug << d->selectedFiles->current()->file() << oendl; 
           m3uList->add( d->selectedFiles->current()->file() );
@@ -327,3 +327,3 @@ void PlayListWidget::addAllVideoToList() {
 void PlayListWidget::setDocument( const QString& fileref ) {
-  //    qDebug( "<<<<<<<<set document>>>>>>>>>> "+fileref );
+  //    odebug << "<<<<<<<<set document>>>>>>>>>> "+fileref << oendl; 
     fromSetDocument = TRUE;
@@ -403,3 +403,3 @@ bool PlayListWidget::prev() {
 bool PlayListWidget::next() {
-//qDebug("<<<<<<<<<<<<next()");
+//odebug << "<<<<<<<<<<<<next()" << oendl; 
     if ( mediaPlayerState->isShuffled() ) {
@@ -614,3 +614,3 @@ void PlayListWidget::openURL() {
         filename = fileDlg->text();
-        qDebug( "Selected filename is " + filename );
+        odebug << "Selected filename is " + filename << oendl; 
         //            Om3u *m3uList;
@@ -690,3 +690,3 @@ void PlayListWidget::openFile() {
 
-        qDebug( "Selected filename is " + str );
+        odebug << "Selected filename is " + str << oendl; 
         filename = str;
@@ -708,3 +708,3 @@ void PlayListWidget::openFile() {
 void PlayListWidget::readListFromFile( const QString &filename ) {
-    qDebug( "read list filename " + filename );
+    odebug << "read list filename " + filename << oendl; 
     QFileInfo fi(filename);
@@ -721,3 +721,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
         s = *it;
-        //        qDebug(s);
+        //        odebug << s << oendl; 
         if(s.left(4)=="http") {
@@ -755,3 +755,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
  void PlayListWidget::writeCurrentM3u() {
-   qDebug("writing to current m3u");
+   odebug << "writing to current m3u" << oendl; 
    Config cfg( "OpiePlayer" );
@@ -765,3 +765,3 @@ 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() );
@@ -769,3 +769,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
        while ( d->selectedFiles->next() );
-       //    qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
+       //    odebug << "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" << oendl; 
        m3uList->write();
@@ -814,3 +814,3 @@ void PlayListWidget::writem3u() {
         //       name = fileDlg->text();
-//        qDebug( filename );
+//        odebug << filename << oendl; 
         if( name.find("/",0,true) != -1) {// assume they specify a file path
@@ -832,3 +832,3 @@ void PlayListWidget::writem3u() {
           while ( d->selectedFiles->next() );
-          //    qDebug( list );
+          //    odebug << list << oendl; 
           m3uList->write();
@@ -844,3 +844,3 @@ void PlayListWidget::writem3u() {
 
-          // qDebug(filename);
+          // odebug << filename << oendl; 
           Config config( "OpiePlayer" );
@@ -852,3 +852,3 @@ void PlayListWidget::writem3u() {
           if(!lnk.writeLink()) {
-            qDebug("Writing doclink did not work");
+            odebug << "Writing doclink did not work" << oendl; 
           }
@@ -886,3 +886,3 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
     //       case Key_P: //play
-    //           qDebug("Play");
+    //           odebug << "Play" << oendl; 
     //           playSelected();
@@ -916,3 +916,3 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
 void PlayListWidget::pmViewActivated(int index) {
-//  qDebug("%d", index);
+//  odebug << "" << index << "" << oendl; 
     switch(index) {
@@ -946,3 +946,3 @@ void PlayListWidget::populateSkinsMenu() {
         skinName =  fi->fileName();
-//        qDebug(  fi->fileName() );
+//        odebug << fi->fileName() << oendl; 
         if( skinName != "." &&  skinName != ".." && skinName !="CVS" )  {
@@ -1002,3 +1002,3 @@ 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 );
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
@@ -185,3 +185,3 @@ 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
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
@@ -180,3 +180,3 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file
     else
-        qDebug( "SkinCache: hit" );
+        odebug << "SkinCache: hit" << oendl; 
 
@@ -184,3 +184,3 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file
     if ( bgPixmap ) {
-        qDebug( "SkinCache: hit on bgpixmap" );
+        odebug << "SkinCache: hit on bgpixmap" << oendl; 
         data->backgroundPixmap = *bgPixmap;
@@ -220,3 +220,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadBackgroundPixmap:
-            qDebug( "load bgpixmap" );
+            odebug << "load bgpixmap" << oendl; 
             m_skin.backgroundPixmap();
@@ -225,3 +225,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadButtonUpImage:
-            qDebug( "load upimage" );
+            odebug << "load upimage" << oendl; 
             m_skin.buttonUpImage();
@@ -230,3 +230,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadButtonDownImage:
-            qDebug( "load downimage" );
+            odebug << "load downimage" << oendl; 
             m_skin.buttonDownImage();
@@ -236,3 +236,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         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 );
@@ -245,3 +245,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadButtonMask:
-            qDebug( "load whole mask" );
+            odebug << "load whole mask" << oendl; 
             m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount );
@@ -260,3 +260,3 @@ SkinLoader::~SkinLoader()
 {
-    qDebug( "SkinLoader::~SkinLoader()" );
+    odebug << "SkinLoader::~SkinLoader()" << oendl; 
     killTimers();
@@ -279,3 +279,3 @@ void SkinLoader::start()
     m_timerId = startTimer( 100 /* ms */ );
-    qDebug( "SkinLoader::start() %d jobs", pendingSkins.count() );
+    odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; 
 }
@@ -292,3 +292,3 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
         if ( pendingSkins.isEmpty() ) {
-            qDebug( "all jobs done" );
+            odebug << "all jobs done" << oendl; 
             killTimer( m_timerId );
@@ -304,3 +304,3 @@ 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; 
     }
@@ -312,3 +312,3 @@ 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
@@ -189,3 +189,3 @@ void Thread::start()
     if ( d->isRunning ) {
-        qDebug( "ThreadUtil::Thread::start() called for running thread." );
+        odebug << "ThreadUtil::Thread::start() called for running thread." << oendl; 
         return;
@@ -198,3 +198,3 @@ void Thread::start()
     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 );
@@ -286,3 +286,3 @@ void ChannelMessage::reply()
     {
-        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
@@ -95,3 +95,3 @@ void XineControl::play( const QString& fileName ) {
 
-    qDebug("<<FILENAME: " + fileName  + ">>>>");
+    odebug << "<<FILENAME: " + fileName  + ">>>>" << oendl; 
 
@@ -108,3 +108,3 @@ void XineControl::play( const QString& fileName ) {
         displayType = MediaPlayerState::Audio;
-        qDebug("HAS AUDIO");
+        odebug << "HAS AUDIO" << oendl; 
         libXine->setShowVideo( false );
@@ -113,3 +113,3 @@ void XineControl::play( const QString& fileName ) {
         displayType = MediaPlayerState::Video;
-        qDebug("HAS VIDEO");
+        odebug << "HAS VIDEO" << oendl; 
         libXine->setShowVideo( true );
@@ -245,3 +245,3 @@ QString XineControl::getErrorCode() {
 
-    qDebug( QString("ERRORCODE: %1 ").arg(errorCode) );
+    odebug << QString("ERRORCODE: %1 ").arg(errorCode) << oendl;