Mercurial > audlegacy
changeset 2706:958d12f78138 trunk
[svn] Completed the implementation of all the stubs in dbus.c, and commented the creation of the mpris dbus bindings to fix compilation issues.
| author | magma |
|---|---|
| date | Tue, 08 May 2007 10:26:29 -0700 |
| parents | f3bc7cb81ed8 |
| children | 59f66e882499 |
| files | ChangeLog src/audacious/Makefile src/audacious/build_stamp.c src/audacious/dbus.c src/audacious/objects.xml |
| diffstat | 5 files changed, 31 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 07 18:04:06 2007 -0700 +++ b/ChangeLog Tue May 08 10:26:29 2007 -0700 @@ -1,3 +1,12 @@ +2007-05-08 01:04:06 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4436] + - define mpris /Player object in XML. + + trunk/src/audacious/Makefile | 1 + trunk/src/audacious/mpris_player.xml | 71 +++++++++++++++++++++++++++++++++++ + 2 files changed, 72 insertions(+) + + 2007-05-08 00:56:35 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4434] - define mpris /TrackList object in XML.
--- a/src/audacious/Makefile Mon May 07 18:04:06 2007 -0700 +++ b/src/audacious/Makefile Tue May 08 10:26:29 2007 -0700 @@ -125,9 +125,9 @@ dbus-bindings.h: $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=audacious_remote objects.xml > $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@ - $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@ + # $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@ + # $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@ + # $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@ @printf "%10s %-20s\n" DBUS-BIND $@ OBJECTIVE_DATA = audacious.desktop:$(datadir)/applications
--- a/src/audacious/build_stamp.c Mon May 07 18:04:06 2007 -0700 +++ b/src/audacious/build_stamp.c Tue May 08 10:26:29 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070508-4434"; +const gchar *svn_stamp = "20070508-4436";
--- a/src/audacious/dbus.c Mon May 07 18:04:06 2007 -0700 +++ b/src/audacious/dbus.c Tue May 08 10:26:29 2007 -0700 @@ -154,6 +154,7 @@ // Playlist Information/Manipulation gboolean audacious_remote_position(RemoteObject *obj, int *pos, GError **error) { + *pos = playlist_get_position(playlist_get_active()); return TRUE; } @@ -169,60 +170,76 @@ gboolean audacious_remote_length(RemoteObject *obj, int *length, GError **error) { + *length = playlist_get_length(playlist_get_active()); return TRUE; } gboolean audacious_remote_song_title(RemoteObject *obj, int pos, gchar **title, GError **error) { + *title = playlist_get_songtitle(playlist_get_active(), pos); return TRUE; } gboolean audacious_remote_song_filename(RemoteObject *obj, int pos, gchar **filename, GError **error) { + *filename = playlist_get_filename(playlist_get_active(), pos); return TRUE; } gboolean audacious_remote_song_length(RemoteObject *obj, int pos, int *length, GError **error) { + *length = playlist_get_songtime(playlist_get_active(), pos) / 1000; return TRUE; } gboolean audacious_remote_song_frames(RemoteObject *obj, int pos, int *length, GError **error) { + *length = playlist_get_songtime(playlist_get_active(), pos); return TRUE; } gboolean audacious_remote_jump(RemoteObject *obj, int pos, GError **error) { + if (pos < (guint)playlist_get_length(playlist_get_active())) + playlist_set_position(playlist_get_active(), pos); return TRUE; } gboolean audacious_remote_add_url(RemoteObject *obj, gchar *url, GError **error) { + playlist_add_url(playlist_get_active(), url); return TRUE; } gboolean audacious_remote_delete(RemoteObject *obj, int pos, GError **error) { + playlist_delete_index(playlist_get_active(), pos); return TRUE; } gboolean audacious_remote_clear(RemoteObject *obj, GError **error) { + playlist_clear(playlist_get_active()); + mainwin_clear_song_info(); + mainwin_set_info_text(); return TRUE; } gboolean audacious_remote_repeating(RemoteObject *obj, gboolean *is_repeating, GError **error) { + *is_repeating = cfg.repeat; return TRUE; } gboolean audacious_remote_repeat(RemoteObject *obj, GError **error) { + mainwin_repeat_pushed(!cfg.repeat); return TRUE; } gboolean audacious_remote_shuffling(RemoteObject *obj, gboolean *is_shuffling, GError **error) { + *is_shuffling = cfg.shuffle; return TRUE; } gboolean audacious_remote_shuffle(RemoteObject *obj, GError **error) { + mainwin_shuffle_pushed(!cfg.shuffle); return TRUE; }
--- a/src/audacious/objects.xml Mon May 07 18:04:06 2007 -0700 +++ b/src/audacious/objects.xml Tue May 08 10:26:29 2007 -0700 @@ -90,7 +90,7 @@ CMD_PLAYLIST_GET_TUPLE_DATA --> -<node name="/org/atheme/audacious"> +<node name="/"> <!-- Audacious General Information --> <interface name="org.atheme.audacious.general"> <!-- Audacious version -->