# HG changeset patch # User mf0102 <0102@gmx.at> # Date 1211377836 -7200 # Node ID c2d739b4c84df7d2ec316824166e5f1c2c00bdc4 # Parent 3789057a3f4f7399c1d25bb9e666bcf183b5024f revert DBus removals diff -r 3789057a3f4f -r c2d739b4c84d src/audacious/dbus-service.h --- a/src/audacious/dbus-service.h Wed May 21 15:55:45 2008 +0300 +++ b/src/audacious/dbus-service.h Wed May 21 15:50:36 2008 +0200 @@ -192,10 +192,8 @@ gboolean audacious_rc_activate(RemoteObject *obj, GError **error); gboolean audacious_rc_queue_get_list_pos(RemoteObject *obj, gint qpos, gint *pos, GError **error); gboolean audacious_rc_queue_get_queue_pos(RemoteObject *obj, gint pos, gint *qpos, GError **error); -#if 0 gboolean audacious_rc_get_skin(RemoteObject *obj, gchar **skin, GError **error); gboolean audacious_rc_set_skin(RemoteObject *obj, gchar *skin, GError **error); -#endif gboolean audacious_rc_get_info(RemoteObject *obj, gint *rate, gint *freq, gint *nch, GError **error); gboolean audacious_rc_toggle_aot(RemoteObject *obj, gboolean ontop, GError **error); gboolean audacious_rc_get_playqueue_length(RemoteObject *obj, gint *length, GError **error); @@ -207,7 +205,6 @@ gboolean audacious_rc_playlist_enqueue_to_temp(RemoteObject *obj, gchar *url, GError **error); gboolean audacious_rc_playlist_add(RemoteObject *obj, gpointer list, GError **error); -#if 0 /* new on nov 7 */ gboolean audacious_rc_get_eq(RemoteObject *obj, gdouble *preamp, GArray **bands, GError **error); gboolean audacious_rc_get_eq_preamp(RemoteObject *obj, gdouble *preamp, GError **error); @@ -216,6 +213,5 @@ gboolean audacious_rc_set_eq_preamp(RemoteObject *obj, gdouble preamp, GError **error); gboolean audacious_rc_set_eq_band(RemoteObject *obj, gint band, gdouble value, GError **error); gboolean audacious_rc_equalizer_activate(RemoteObject *obj, gboolean active, GError **error); -#endif #endif /* AUDACIOUS_DBUS_SERVICE_H */ diff -r 3789057a3f4f -r c2d739b4c84d src/audacious/dbus.c --- a/src/audacious/dbus.c Wed May 21 15:55:45 2008 +0300 +++ b/src/audacious/dbus.c Wed May 21 15:50:36 2008 +0200 @@ -39,6 +39,9 @@ #include "tuple.h" #include "strings.h" +#include "ui_equalizer.h" +#include "ui_skin.h" + static DBusGConnection *dbus_conn = NULL; static guint signals[LAST_SIG] = { 0 }; @@ -840,7 +843,6 @@ return TRUE; } -#if 0 /* TODO: these skin functions should be removed when skin functionality * disappears --mf0102 */ gboolean audacious_rc_get_skin(RemoteObject *obj, gchar **skin, GError **error) { @@ -852,7 +854,6 @@ aud_active_skin_load(skin); return TRUE; } -#endif gboolean audacious_rc_get_info(RemoteObject *obj, gint *rate, gint *freq, gint *nch, GError **error) { playback_get_sample_params(rate, freq, nch); @@ -940,7 +941,6 @@ return TRUE; } -#if 0 /* New on Nov 7: Equalizer */ gboolean audacious_rc_get_eq(RemoteObject *obj, gdouble *preamp, GArray **bands, GError **error) { @@ -1004,7 +1004,6 @@ equalizer_activate(active); return TRUE; } -#endif DBusGProxy *audacious_get_dbus_proxy(void)