Mercurial > audlegacy
changeset 2727:14f9a629ba9c trunk
[svn] - rename xmms_remote namespace to audacious_remote namespace
- if HAVE_DBUS get the dbus proxy provider for audacious_remote.
| author | nenolod |
|---|---|
| date | Thu, 10 May 2007 12:30:19 -0700 |
| parents | f15dbec2a8ad |
| children | 452a159dc619 |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/main.c |
| diffstat | 3 files changed, 30 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 09 21:21:02 2007 -0700 +++ b/ChangeLog Thu May 10 12:30:19 2007 -0700 @@ -1,3 +1,11 @@ +2007-05-10 04:21:02 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4478] + - enable dbus support by default + + trunk/configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + + 2007-05-10 04:19:09 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4476] Remove documentation about XMMS controlsocket compatibility. This code
--- a/src/audacious/build_stamp.c Wed May 09 21:21:02 2007 -0700 +++ b/src/audacious/build_stamp.c Thu May 10 12:30:19 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070510-4476"; +const gchar *svn_stamp = "20070510-4478";
--- a/src/audacious/main.c Wed May 09 21:21:02 2007 -0700 +++ b/src/audacious/main.c Thu May 10 12:30:19 2007 -0700 @@ -896,7 +896,9 @@ gboolean remote) { gchar **filenames = options->filenames; - gint session = options->session; +#ifdef HAVE_DBUS + DBusGProxy *session = audacious_get_dbus_proxy(); +#endif if (options->version) { @@ -930,31 +932,31 @@ if (options->load_skins) { - xmms_remote_set_skin(session, filenames[0]); + audacious_remote_set_skin(session, filenames[0]); skin_install_skin(filenames[0]); } else { if (options->enqueue_to_temp) - xmms_remote_playlist_enqueue_to_temp(session, filenames[0]); + audacious_remote_playlist_enqueue_to_temp(session, filenames[0]); if (options->enqueue && options->play) - pos = xmms_remote_get_playlist_length(session); + pos = audacious_remote_get_playlist_length(session); if (!options->enqueue) { - xmms_remote_playlist_clear(session); - xmms_remote_stop(session); + audacious_remote_playlist_clear(session); + audacious_remote_stop(session); } - xmms_remote_playlist_add(session, fns); + audacious_remote_playlist_add(session, fns); if (options->enqueue && options->play && - xmms_remote_get_playlist_length(session) > pos) - xmms_remote_set_playlist_pos(session, pos); + audacious_remote_get_playlist_length(session) > pos) + audacious_remote_set_playlist_pos(session, pos); if (!options->enqueue) - xmms_remote_play(session); + audacious_remote_play(session); } g_list_foreach(fns, (GFunc) g_free, NULL); @@ -964,31 +966,31 @@ } if (options->rew) - xmms_remote_playlist_prev(session); + audacious_remote_playlist_prev(session); if (options->play) - xmms_remote_play(session); + audacious_remote_play(session); if (options->pause) - xmms_remote_pause(session); + audacious_remote_pause(session); if (options->stop) - xmms_remote_stop(session); + audacious_remote_stop(session); if (options->fwd) - xmms_remote_playlist_next(session); + audacious_remote_playlist_next(session); if (options->play_pause) - xmms_remote_play_pause(session); + audacious_remote_play_pause(session); if (options->show_jump_box) - xmms_remote_show_jtf_box(session); + audacious_remote_show_jtf_box(session); if (options->mainwin) - xmms_remote_main_win_toggle(session, TRUE); + audacious_remote_main_win_toggle(session, TRUE); if (options->activate) - xmms_remote_activate(session); + audacious_remote_activate(session); #endif if (options->playcd)