=== modified file 'musicPlayer/src/applet-songbird.c'
--- musicPlayer/src/applet-songbird.c	2009-10-17 01:36:44 +0000
+++ musicPlayer/src/applet-songbird.c	2010-03-13 06:35:28 +0000
@@ -16,108 +16,26 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <glib/gi18n.h>
 #include <cairo-dock.h>
 
-
 #include "applet-struct.h"
 #include "applet-musicplayer.h"
-#include "applet-dbus.h"
-
-#include "applet-draw.h"
+#include "applet-mpris.h"
 #include "applet-songbird.h"
 
-
-
-void cd_songbird_getSongInfos (void)
-{
-	if( myData.cPreviousRawTitle )
-	{
-		g_free( myData.cPreviousRawTitle ); myData.cPreviousRawTitle = NULL;
-	}
-	if( myData.cRawTitle )
-	{
-		myData.cPreviousRawTitle = g_strdup(myData.cRawTitle);
-	}
-	
-	myData.cAlbum = cairo_dock_dbus_get_string (myData.dbus_proxy_player, myData.DBus_commands.get_album);
-	myData.cArtist = cairo_dock_dbus_get_string (myData.dbus_proxy_player, myData.DBus_commands.get_artist);
-	myData.cTitle = cairo_dock_dbus_get_string (myData.dbus_proxy_player, myData.DBus_commands.get_title);
-	//Artist & Title = RawTitle
-	myData.cRawTitle = g_strdup_printf ("%s - %s", myData.cArtist,myData.cTitle );
-	//cd_message("MP : %s - %s - %s", myData.cRawTitle, myData.cArtist, myData.cAlbum);
-}
-
-
-void cd_songbird_free_data (void) { //Permet de libéré la mémoire prise par notre controleur
-	musicplayer_dbus_disconnect_from_bus();
-}
-
-/* Controle du lecteur */
-void cd_songbird_control (MyPlayerControl pControl, char* nothing) { //Permet d'effectuer les actions de bases sur le lecteur
-	return;
-}
-
-
-/* Fonction de lecture des infos */
-void cd_songbird_read_data (void) {
-	if (myData.dbus_enable)
-	{
-		if (myData.bIsRunning)
-		{
-			cd_musicplayer_getStatus_string("playing", "paused", "stopped"); // On recupere l'etat de la lecture (play/pause/stop)
-			if (myData.iPlayingStatus == PLAYER_PLAYING)
-			{
-				cd_songbird_getSongInfos(); // On recupere toutes les infos de la piste en cours
-			}	
-		}
-		else
-		{
-			cd_debug("MP : lecteur non ouvert");
-			myData.iPlayingStatus = PLAYER_NONE;	
-		}
-	}
-	else
-	{
-		cd_debug("MP : Impossible d'accéder au bus");
-		myData.iPlayingStatus = PLAYER_BROKEN;
-	}
-	
-}
-
-void cd_songbird_load_dbus_commands (void)
-{
-	myData.DBus_commands.service = "org.mozilla.songbird";
-	myData.DBus_commands.path = "/org/mozilla/songbird";
-	myData.DBus_commands.interface = "org.mozilla.songbird";
-	myData.DBus_commands.previous = "prev_track";
-	myData.DBus_commands.get_title = "getTitle";
-	myData.DBus_commands.get_artist = "getArtist";
-	myData.DBus_commands.get_album = "getAlbum";
-	myData.DBus_commands.get_status = "getStatus";
-	//cd_debug("MP : Chargement des fonctions DBus effectué");	
-}
-
-
-void cd_musicplayer_register_songbird_handler (void) { //On enregistre notre lecteur
-	MusicPlayerHandeler *pSongbird = g_new0 (MusicPlayerHandeler, 1);
-	pSongbird->read_data = cd_songbird_read_data;
-	pSongbird->free_data = cd_songbird_free_data;
-	pSongbird->configure = cd_songbird_load_dbus_commands; //Cette fonction permettera de préparé le controleur
-	//cd_debug("MP : Valeur de configure : %s", pSongbird->configure);
-	//Pour les lecteurs utilisants dbus, c'est elle qui connectera le dock aux services des lecteurs etc..
-	pSongbird->control = cd_songbird_control;
-	pSongbird->appclass = g_strdup("Songbird"); //Toujours g_strdup sinon l'applet plante au free_handler
-	pSongbird->name = g_strdup("Songbird");
-	pSongbird->launch = g_strdup("songbird");
-	pSongbird->cMprisService = "org.mozilla.songbird";
-	pSongbird->iPlayerControls = 0;  // ne gere rien !
+/* On enregistre notre lecteur.
+ */
+void cd_musicplayer_register_songbird_handler (void)
+{
+	MusicPlayerHandeler *pSongbird = cd_mpris_new_handler ();
+	pSongbird->cMprisService = "org.mpris.songbird";  /// trouver le nom ...
+	pSongbird->appclass = "songbird";  /// idem...
+	pSongbird->launch = "songbird-bin";  /// idem...
+	pSongbird->name = "Songbird";
 	pSongbird->iPlayer = MP_SONGBIRD;
-	pSongbird->bSeparateAcquisition = FALSE;
-	pSongbird->iLevel = PLAYER_BAD;
-	cd_musicplayer_register_my_handler(pSongbird,"Songbird");
+	cd_musicplayer_register_my_handler (pSongbird, "Songbird");
 }

=== modified file 'musicPlayer/src/applet-songbird.h'
--- musicPlayer/src/applet-songbird.h	2009-09-01 19:55:41 +0000
+++ musicPlayer/src/applet-songbird.h	2010-03-13 06:29:17 +0000
@@ -20,21 +20,9 @@
 #ifndef __APPLET_SONGBIRD__
 #define  __APPLET_SONGBIRD__
 
+
 #include <cairo-dock.h>
 
-void cd_songbird_getSongInfos (void);
-
-void cd_songbird_free_data (void);
-
-void cd_songbird_control (MyPlayerControl pControl, char*);
-
-void cd_songbird_load_dbus_commands (void);
-
-gboolean cd_songbird_ask_control (MyPlayerControl pControl);
-
-void cd_songbird_acquisition (void);
-
-void cd_songbird_read_data (void);
 
 void cd_musicplayer_register_songbird_handler (void);