[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/xine
From:       Jeff Mitchell <kde-dev () emailgoeshere ! com>
Date:       2007-05-20 3:22:31
Message-ID: 1179631351.684375.27611.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 666495 by mitchell:

Deprecation--


 M  +36 -39    xine-engine.cpp  
 M  +14 -0     xine-engine.h  


--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.cpp #666494:666495
@@ -793,45 +793,44 @@
 void
 XineEngine::customEvent( QEvent *event )
 {
-    if( QCustomEvent *e = dynamic_cast<QCustomEvent*>( event ) ) {
-        #define message static_cast<QString*>(e->data())
+    
+    #define message dynamic_cast<XineEvent*>(event)->getData()
 
-        switch( e->type() )
-        {
-        case 3000: //XINE_EVENT_UI_PLAYBACK_FINISHED
-            emit trackEnded();
-            break;
+    switch( event->type() )
+    {
+    case 3000: //XINE_EVENT_UI_PLAYBACK_FINISHED
+        emit trackEnded();
+        break;
 
-        case 3001:
-            emit infoMessage( (*message).arg( m_url.prettyUrl() ) );
-            delete message;
-            break;
+    case 3001:
+        emit infoMessage( (*message).arg( m_url.prettyUrl() ) );
+        delete message;
+        break;
 
-        case 3002:
-            emit statusText( *message );
-            delete message;
-            break;
+    case 3002:
+        emit statusText( *message );
+        delete message;
+        break;
 
-        case 3003: { //meta info has changed
-            debug() << "Metadata received." << endl;
-            const Engine::SimpleMetaBundle bundle = fetchMetaData();
-            m_currentBundle = bundle;
-            emit metaData( bundle );
-        }   break;
+    case 3003: { //meta info has changed
+        debug() << "Metadata received." << endl;
+        const Engine::SimpleMetaBundle bundle = fetchMetaData();
+        m_currentBundle = bundle;
+        emit metaData( bundle );
+    }   break;
 
-        case 3004:
-            emit statusText( i18n("Redirecting to: ", *message ) );
-            load( KUrl( *message ), false );
-            play();
-            delete message;
-            break;
+    case 3004:
+        emit statusText( i18n("Redirecting to: ", *message ) );
+        load( KUrl( *message ), false );
+        play();
+        delete message;
+        break;
 
-        default:
-            ;
-        }
-
-        #undef message
+    default:
+        ;
     }
+
+    #undef message
 }
 //SLOT
 void XineEngine::configChanged()
@@ -900,7 +899,7 @@
 
         debug() << "XINE_EVENT_UI_SET_TITLE\n";
 
-        QApplication::postEvent( xe, new QCustomEvent( 3003 ) );
+        QApplication::postEvent( xe, new QEvent( QEvent::Type( 3003 ) ) );
 
         break;
 
@@ -915,7 +914,7 @@
                 xine_set_param( xe->m_stream, XINE_PARAM_GAPLESS_SWITCH, 1);
         #endif
         //emit signal from GUI thread
-        QApplication::postEvent( xe, new QCustomEvent(3000) );
+        QApplication::postEvent( xe, new QEvent( QEvent::Type( 3000 ) ) );
         break;
 
     case XINE_EVENT_PROGRESS: {
@@ -926,8 +925,7 @@
         msg = msg.arg( QString::fromUtf8( pd->description ) )
                  .arg( KGlobal::locale()->formatNumber( pd->percent, 0 ) );
 
-        QCustomEvent *e = new QCustomEvent( 3002 );
-        e->setData( new QString( msg ) );
+        XineEvent *e = new XineEvent( QEvent::Type( 3002 ), new QString( msg ) );
 
         QApplication::postEvent( xe, e );
 
@@ -938,8 +936,7 @@
         /// so we need to play that instead
 
         QString message = QString::fromUtf8( static_cast<xine_mrl_reference_data_t*>(xineEvent->data)->mrl );
-        QCustomEvent *e = new QCustomEvent( 3004 );
-        e->setData( new QString( message ) );
+        XineEvent *e = new XineEvent( QEvent::Type( 3004 ), new QString( message ) );
 
         QApplication::postEvent( xe, e );
 
@@ -1043,7 +1040,7 @@
             }
             else message += i18n("Sorry, no additional information is available.");
 
-            QApplication::postEvent( xe, new QCustomEvent(QEvent::Type(3001), new QString(message)) );
+            QApplication::postEvent( xe, new XineEvent( QEvent::Type( 3001 ), new QString( message ) ) );
         }
 
     } //case
--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.h #666494:666495
@@ -14,6 +14,7 @@
 #include "amarok_engines_export.h"
 #include "enginebase.h"
 
+#include <QEvent>
 #include <QList>
 #include <QThread>
 
@@ -100,6 +101,19 @@
 public:
     XineEngine();
 
+public:
+    class XineEvent : public QEvent {
+        public:
+            XineEvent( QEvent::Type type, QString* data )
+                : QEvent( type )
+                , m_data( data )
+                {}
+            QString* getData() { return m_data; }
+            void setData( QString* data ) { m_data = data; }
+        private:
+            QString* m_data;
+    };
+
 signals:
     void resetConfig(xine_t *xine);
 };
[prev in list] [next in list] [prev in thread] [next in thread]