# HG changeset patch # User magma # Date 1179082561 25200 # Node ID 55dc022c405a257fd5a726960341f7590cf8da06 # Parent ea20b1e9241179908443514f551fa4b22d7ac93e [svn] Changed signedness and formatting. diff -r ea20b1e92411 -r 55dc022c405a ChangeLog --- a/ChangeLog Sun May 13 02:31:11 2007 -0700 +++ b/ChangeLog Sun May 13 11:56:01 2007 -0700 @@ -1,3 +1,13 @@ +2007-05-13 09:31:11 +0000 Ben Tucker + revision [4558] + Added CMD_GET_INFO and CMD_PLAYLIST_GET_TUPLE_DATA replacements; Changed some formatting and used unsigned numbers where appropriate. + + trunk/src/audacious/dbus-service.h | 63 +++++++++-------- + trunk/src/audacious/dbus.c | 133 +++++++++++++++++++++++++++---------- + trunk/src/audacious/objects.xml | 51 ++++++++++---- + 3 files changed, 172 insertions(+), 75 deletions(-) + + 2007-05-13 08:29:56 +0000 Ben Tucker revision [4556] Fixed link error caused by libaudclient being in LDADD for audacious. diff -r ea20b1e92411 -r 55dc022c405a src/audacious/build_stamp.c --- a/src/audacious/build_stamp.c Sun May 13 02:31:11 2007 -0700 +++ b/src/audacious/build_stamp.c Sun May 13 11:56:01 2007 -0700 @@ -1,2 +1,2 @@ #include -const gchar *svn_stamp = "20070513-4556"; +const gchar *svn_stamp = "20070513-4558"; diff -r ea20b1e92411 -r 55dc022c405a src/libaudclient/audctrl.c --- a/src/libaudclient/audctrl.c Sun May 13 02:31:11 2007 -0700 +++ b/src/libaudclient/audctrl.c Sun May 13 11:56:01 2007 -0700 @@ -72,7 +72,7 @@ * * Deletes a playlist entry. **/ -void audacious_remote_playlist_delete(DBusGProxy *proxy, gint pos) { +void audacious_remote_playlist_delete(DBusGProxy *proxy, guint pos) { } /** @@ -147,7 +147,7 @@ * Return value: The current playlist position. **/ gint audacious_remote_get_playlist_pos(DBusGProxy *proxy) { - gint pos; + guint pos; org_atheme_audacious_position(proxy, &pos, &error); g_clear_error(&error); return pos; @@ -160,7 +160,7 @@ * * Tells audacious to jump to a different playlist position. **/ -void audacious_remote_set_playlist_pos(DBusGProxy *proxy, gint pos) { +void audacious_remote_set_playlist_pos(DBusGProxy *proxy, guint pos) { } /** @@ -198,7 +198,7 @@ * Return value: The current output position. **/ gint audacious_remote_get_output_time(DBusGProxy *proxy) { - gint time; + guint time; org_atheme_audacious_time(proxy, &time, &error); g_clear_error(&error); return time; @@ -211,7 +211,7 @@ * * Tells audacious to seek to a new time position. **/ -void audacious_remote_jump_to_time(DBusGProxy *proxy, gint pos) { +void audacious_remote_jump_to_time(DBusGProxy *proxy, guint pos) { } /** @@ -353,7 +353,7 @@ * * Return value: A path to the file in the playlist at %pos position. **/ -gchar *audacious_remote_get_playlist_file(DBusGProxy *proxy, gint pos) { +gchar *audacious_remote_get_playlist_file(DBusGProxy *proxy, guint pos) { gchar *out; org_atheme_audacious_song_filename(proxy, pos, &out, &error); g_clear_error(&error); @@ -369,7 +369,7 @@ * * Return value: The title for the entry in the playlist at %pos position. **/ -gchar *audacious_remote_get_playlist_title(DBusGProxy *proxy, gint pos) { +gchar *audacious_remote_get_playlist_title(DBusGProxy *proxy, guint pos) { gchar *out; org_atheme_audacious_song_title(proxy, pos, &out, &error); g_clear_error(&error); @@ -385,7 +385,7 @@ * * Return value: The length of the entry in the playlist at %pos position. **/ -gint audacious_remote_get_playlist_time(DBusGProxy *proxy, gint pos) { +gint audacious_remote_get_playlist_time(DBusGProxy *proxy, guint pos) { gint out; org_atheme_audacious_song_frames(proxy, pos, &out, &error); g_clear_error(&error); @@ -698,7 +698,7 @@ * Tells audacious to add an URI to the playlist at a specific position. **/ void audacious_remote_playlist_ins_url_string(DBusGProxy *proxy, - gchar *string, gint pos) { + gchar *string, guint pos) { } /** @@ -708,7 +708,7 @@ * * Tells audacious to add a playlist entry to the playqueue. **/ -void audacious_remote_playqueue_add(DBusGProxy *proxy, gint pos) { +void audacious_remote_playqueue_add(DBusGProxy *proxy, guint pos) { } /** @@ -718,7 +718,7 @@ * * Tells audacious to remove a playlist entry from the playqueue. **/ -void audacious_remote_playqueue_remove(DBusGProxy *proxy, gint pos) { +void audacious_remote_playqueue_remove(DBusGProxy *proxy, guint pos) { } /** @@ -788,7 +788,7 @@ * * Return value: TRUE if yes, FALSE otherwise. **/ -gboolean audacious_remote_playqueue_is_queued(DBusGProxy *proxy, gint pos) { +gboolean audacious_remote_playqueue_is_queued(DBusGProxy *proxy, guint pos) { } /** @@ -800,7 +800,7 @@ * * Return value: TRUE if yes, FALSE otherwise. **/ -gint audacious_remote_get_playqueue_position(DBusGProxy *proxy, gint pos) { +gint audacious_remote_get_playqueue_position(DBusGProxy *proxy, guint pos) { } /** @@ -813,7 +813,7 @@ * Return value: TRUE if yes, FALSE otherwise. **/ gint audacious_remote_get_playqueue_queue_position(DBusGProxy *proxy, - gint pos) { + guint pos) { } /** @@ -838,5 +838,5 @@ * Return value: The requested field's data for the entry in the playlist at %pos position. **/ gchar *audacious_get_tuple_field_data(DBusGProxy *proxy, gchar *field, - gint pos) { + guint pos) { } diff -r ea20b1e92411 -r 55dc022c405a src/libaudclient/audctrl.h --- a/src/libaudclient/audctrl.h Sun May 13 02:31:11 2007 -0700 +++ b/src/libaudclient/audctrl.h Sun May 13 11:56:01 2007 -0700 @@ -31,18 +31,18 @@ gboolean enqueue); gint audacious_remote_get_version(DBusGProxy *proxy); void audacious_remote_playlist_add(DBusGProxy *proxy, GList *list); - void audacious_remote_playlist_delete(DBusGProxy *proxy, gint pos); + void audacious_remote_playlist_delete(DBusGProxy *proxy, guint pos); void audacious_remote_play(DBusGProxy *proxy); void audacious_remote_pause(DBusGProxy *proxy); void audacious_remote_stop(DBusGProxy *proxy); gboolean audacious_remote_is_playing(DBusGProxy *proxy); gboolean audacious_remote_is_paused(DBusGProxy *proxy); gint audacious_remote_get_playlist_pos(DBusGProxy *proxy); - void audacious_remote_set_playlist_pos(DBusGProxy *proxy, gint pos); + void audacious_remote_set_playlist_pos(DBusGProxy *proxy, guint pos); gint audacious_remote_get_playlist_length(DBusGProxy *proxy); void audacious_remote_playlist_clear(DBusGProxy *proxy); gint audacious_remote_get_output_time(DBusGProxy *proxy); - void audacious_remote_jump_to_time(DBusGProxy *proxy, gint pos); + void audacious_remote_jump_to_time(DBusGProxy *proxy, guint pos); void audacious_remote_get_volume(DBusGProxy *proxy, gint *vl, gint *vr); gint audacious_remote_get_main_volume(DBusGProxy *proxy); gint audacious_remote_get_balance(DBusGProxy *proxy); @@ -51,9 +51,9 @@ void audacious_remote_set_balance(DBusGProxy *proxy, gint b); gchar *audacious_remote_get_skin(DBusGProxy *proxy); void audacious_remote_set_skin(DBusGProxy *proxy, gchar *skinfile); - gchar *audacious_remote_get_playlist_file(DBusGProxy *proxy, gint pos); - gchar *audacious_remote_get_playlist_title(DBusGProxy *proxy, gint pos); - gint audacious_remote_get_playlist_time(DBusGProxy *proxy, gint pos); + gchar *audacious_remote_get_playlist_file(DBusGProxy *proxy, guint pos); + gchar *audacious_remote_get_playlist_title(DBusGProxy *proxy, guint pos); + gint audacious_remote_get_playlist_time(DBusGProxy *proxy, guint pos); void audacious_remote_get_info(DBusGProxy *proxy, gint *rate, gint *freq, gint *nch); void audacious_remote_main_win_toggle(DBusGProxy *proxy, gboolean show); @@ -90,11 +90,11 @@ /* Added in XMMS 1.2.6 */ void audacious_remote_play_pause(DBusGProxy *proxy); void audacious_remote_playlist_ins_url_string(DBusGProxy *proxy, - gchar *string, gint pos); + gchar *string, guint pos); /* Added in XMMS 1.2.11 */ - void audacious_remote_playqueue_add(DBusGProxy *proxy, gint pos); - void audacious_remote_playqueue_remove(DBusGProxy *proxy, gint pos); + void audacious_remote_playqueue_add(DBusGProxy *proxy, guint pos); + void audacious_remote_playqueue_remove(DBusGProxy *proxy, guint pos); gint audacious_remote_get_playqueue_length(DBusGProxy *proxy); void audacious_remote_toggle_advance(DBusGProxy *proxy); gboolean audacious_remote_is_advance(DBusGProxy *proxy); @@ -105,10 +105,10 @@ /* Added in Audacious 1.1 */ void audacious_remote_show_jtf_box(DBusGProxy *proxy); void audacious_remote_playqueue_clear(DBusGProxy *proxy); - gboolean audacious_remote_playqueue_is_queued(DBusGProxy *proxy, gint pos); - gint audacious_remote_get_playqueue_position(DBusGProxy *proxy, gint pos); + gboolean audacious_remote_playqueue_is_queued(DBusGProxy *proxy, guint pos); + gint audacious_remote_get_playqueue_position(DBusGProxy *proxy, guint pos); gint audacious_remote_get_playqueue_queue_position(DBusGProxy *proxy, - gint pos); + guint pos); /* Added in Audacious 1.2 */ void audacious_set_session_uri(DBusGProxy *proxy, gchar *uri); @@ -119,7 +119,7 @@ void audacious_remote_playlist_enqueue_to_temp(DBusGProxy *proxy, gchar *string); gchar *audacious_get_tuple_field_data(DBusGProxy *proxy, gchar *field, - gint pos); + guint pos); #ifdef __cplusplus };