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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/dbus
From:       Alex Merry <huntedhacker () tiscali ! co ! uk>
Date:       2008-07-14 15:27:13
Message-ID: 1216049233.556483.17490.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 832398 by alexmerry:

Fix signal emitting on the MPRIS interface.

Signals in /Player are now emitted correctly.

Signals in /TrackList aren't yet (see the FIXME note).



 M  +7 -11     PlayerDBusHandler.cpp  
 M  +5 -3      TracklistDBusHandler.cpp  


--- trunk/extragear/multimedia/amarok/src/dbus/PlayerDBusHandler.cpp #832397:832398
@@ -34,20 +34,16 @@
         : QObject(kapp)
     {
         s_instance = this;
-
-        // NOTE disabled because it caused a crash on startup
-#if 0
-        QObject* pa = new PlayerAdaptor( this );
         setObjectName("PlayerDBusHandler");
 
-        connect( The::engineController(), SIGNAL( trackChanged( Meta::TrackPtr ) ), \
                pa, SLOT( slotTrackChange() ) );
-        connect( The::engineController(), SIGNAL( trackChanged( Meta::TrackPtr ) ), \
                pa, SLOT( slotStatusChange() ) );
-        connect( The::engineController(), SIGNAL( trackFinished() ), pa, SLOT( \
                slotStatusChange() ) );
-        connect( The::engineController(), SIGNAL( trackPlayPause( int ) ), pa, SLOT( \
                slotStatusChange() ) );
-        connect( this, SIGNAL( statusChange( DBusStatus ) ), pa, SLOT( \
                slotCapsChange() ) );
-#endif
-
+        new PlayerAdaptor( this );
         QDBusConnection::sessionBus().registerObject("/Player", this);
+
+        connect( The::engineController(), SIGNAL( trackChanged( Meta::TrackPtr ) ), \
this, SLOT( slotTrackChange() ) ); +        connect( The::engineController(), SIGNAL( \
trackChanged( Meta::TrackPtr ) ), this, SLOT( slotStatusChange() ) ); +        \
connect( The::engineController(), SIGNAL( trackFinished() ), this, SLOT( \
slotStatusChange() ) ); +        connect( The::engineController(), SIGNAL( \
trackPlayPause( int ) ), this, SLOT( slotStatusChange() ) ); +        connect( this, \
SIGNAL( StatusChange( DBusStatus ) ), this, SLOT( slotCapsChange() ) );  }
 
     DBusStatus PlayerDBusHandler::GetStatus()
--- trunk/extragear/multimedia/amarok/src/dbus/TracklistDBusHandler.cpp \
#832397:832398 @@ -36,10 +36,12 @@
     TracklistDBusHandler::TracklistDBusHandler()
         : QObject( kapp )
     {
-        QObject* pa = new TracklistAdaptor(this);
+        new TracklistAdaptor(this);
         QDBusConnection::sessionBus().registerObject( "/TrackList", this );
-        connect( The::playlistModel(), SIGNAL( playlistCountChanged( int ) ), pa, \
                SLOT( slotTrackListChange() ) );
-        connect( The::playlistModel(), SIGNAL( rowMoved( int, int ) ), pa, SLOT( \
slotTrackListChange() ) ); +        // FIXME: currently The::playlistModel() returns \
null at this point +        //        so the signals don't get connected
+        connect( The::playlistModel(), SIGNAL( playlistCountChanged( int ) ), this, \
SLOT( slotTrackListChange() ) ); +        connect( The::playlistModel(), SIGNAL( \
rowMoved( int, int ) ), this, SLOT( slotTrackListChange() ) );  }
 
     int TracklistDBusHandler::AddTrack( const QString& url, bool playImmediately )


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