Mercurial > audlegacy

changeset 3264:0644dae9e1be trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Tucker <ben.tucker@gmail.com>
date Sun, 29 Jul 2007 11:01:10 -0700
parents 1c58910e0aeb (diff) 7ef1d3b56b92 (current diff)
children fb23cdc95976
files
diffstat 5 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/Makefile	Sun Jul 29 17:35:31 2007 +0200
+++ b/src/audacious/Makefile	Sun Jul 29 11:01:10 2007 -0700
@@ -142,7 +142,7 @@
 CFLAGS += -I../libaudclient
 DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
 OBJECTIVE_LIBS_NOINST += $(DBUS_BINDINGS)
-LIBDEP += ../libaudclient/libaudclient.so
+LIBDEP += ../libaudclient/libaudclient$(SHARED_SUFFIX)
 LDADD += -L../libaudclient -laudclient
 endif
 
--- a/src/audacious/dbus-service.h	Sun Jul 29 17:35:31 2007 +0200
+++ b/src/audacious/dbus-service.h	Sun Jul 29 11:01:10 2007 -0700
@@ -28,6 +28,7 @@
 
 typedef struct {
     GObject parent;
+	DBusGProxy *proxy;
 } RemoteObject, MprisRoot, MprisPlayer, MprisTrackList;
 
 typedef struct {
--- a/src/audacious/dbus.h	Sun Jul 29 17:35:31 2007 +0200
+++ b/src/audacious/dbus.h	Sun Jul 29 11:01:10 2007 -0700
@@ -24,7 +24,8 @@
 #define AUDACIOUS_DBUS_SERVICE      "org.atheme.audacious"
 #define AUDACIOUS_DBUS_PATH         "/org/atheme/audacious"
 #define AUDACIOUS_DBUS_INTERFACE    "org.atheme.audacious"
-#define AUDACIOUS_DBUS_SERVICE_MPRIS    "org.freedesktop.MediaPlayer"
+#define AUDACIOUS_DBUS_SERVICE_MPRIS    "org.mpris.audacious"
+#define AUDACIOUS_DBUS_INTERFACE_MPRIS 	"org.freedesktop.MediaPlayer"
 #define AUDACIOUS_DBUS_PATH_MPRIS_ROOT      "/"
 #define AUDACIOUS_DBUS_PATH_MPRIS_PLAYER    "/Player"
 #define AUDACIOUS_DBUS_PATH_MPRIS_TRACKLIST "/TrackList"
--- a/src/audacious/mpris_player.xml	Sun Jul 29 17:35:31 2007 +0200
+++ b/src/audacious/mpris_player.xml	Sun Jul 29 11:01:10 2007 -0700
@@ -3,6 +3,7 @@
 <!--
  - Audacious: A cross-platform multimedia player
  - Copyright (c) 2007 William Pitcock
+ - Copyright (c) 2007 Ben Tucker
  -
  - This program is free software; you can redistribute it and/or modify
  - it under the terms of the GNU General Public License as published by
@@ -37,7 +38,9 @@
         <method name="Quit">
             <annotation name="org.freedesktop.DBus.GLib.NoReply" value=""/>
         </method>
-
+        <method name="Disconnect">
+            <annotation name="org.freedesktop.DBus.GLib.NoReply" value=""/>
+        </method>
         <method name="Repeat">
             <annotation name="org.freedesktop.DBus.GLib.NoReply" value=""/>
             <arg type="b" direction="in" />
@@ -47,6 +50,10 @@
             <arg type="i" direction="out" />
         </method>
 
+        <method name="GetMetadata">
+            <arg type="a{sv}" direction="out" />
+        </method>
+
         <method name="GetCaps">
             <arg type="i" direction="out" />
         </method>
@@ -80,5 +87,8 @@
         <signal name="StatusChange">
             <arg type="i" />
         </signal>
+
+        <signal name="Disconnected">
+        </signal>
     </interface>
 </node>
--- a/src/audacious/mpris_tracklist.xml	Sun Jul 29 17:35:31 2007 +0200
+++ b/src/audacious/mpris_tracklist.xml	Sun Jul 29 11:01:10 2007 -0700
@@ -3,6 +3,7 @@
 <!--
  - Audacious: A cross-platform multimedia player
  - Copyright (c) 2007 William Pitcock
+ - Copyright (c) 2007 Ben Tucker
  -
  - This program is free software; you can redistribute it and/or modify
  - it under the terms of the GNU General Public License as published by