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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/xine
From:       Maximilian Kossick <maximilian.kossick () googlemail ! com>
Date:       2007-02-17 21:18:41
Message-ID: 1171747121.862144.30679.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 634623 by mkossick:

custom events in the xine engine work now

 M  +33 -31    xine-engine.cpp  
 M  +1 -1      xine-engine.h  


--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.cpp #634622:634623
@@ -795,45 +795,47 @@
 }
 
 void
-XineEngine::customEvent( QCustomEvent *e )
+XineEngine::customEvent( QEvent *event )
 {
-    #define message static_cast<QString*>(e->data())
+    if( QCustomEvent *e = dynamic_cast<QCustomEvent*>( event ) ) {
+        #define message static_cast<QString*>(e->data())
 
-    switch( e->type() )
-    {
-    case 3000: //XINE_EVENT_UI_PLAYBACK_FINISHED
-        emit trackEnded();
-        break;
+        switch( e->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:
-        ;
+        default:
+            ;
+        }
+
+        #undef message
     }
-
-    #undef message
 }
 //SLOT
 void XineEngine::configChanged()
--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.h #634622:634623
@@ -60,7 +60,7 @@
     virtual void fadeOut( uint fadeLength, bool* terminate, bool exiting = false );
 
     static  void XineEventListener( void*, const xine_event_t* );
-    virtual void customEvent( QCustomEvent* );
+    virtual void customEvent( QEvent* );
     virtual void timerEvent( QTimerEvent* );
 
     virtual void playlistChanged();
[prev in list] [next in list] [prev in thread] [next in thread]