# HG changeset patch # User mf0102 <0102@gmx.at> # Date 1211371125 -7200 # Node ID 744953f257fbabec31a5a06c682b5a71aca9f7ef # Parent 11f7874f3a9516ec610c5d499aa44bee477fbbce uncomment last dbus functions that need UI access diff -r 11f7874f3a95 -r 744953f257fb src/audacious/dbus-service.h --- a/src/audacious/dbus-service.h Wed May 21 13:12:39 2008 +0200 +++ b/src/audacious/dbus-service.h Wed May 21 13:58:45 2008 +0200 @@ -192,8 +192,10 @@ 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); @@ -205,6 +207,7 @@ 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); @@ -213,5 +216,6 @@ 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 11f7874f3a95 -r 744953f257fb src/audacious/dbus.c --- a/src/audacious/dbus.c Wed May 21 13:12:39 2008 +0200 +++ b/src/audacious/dbus.c Wed May 21 13:58:45 2008 +0200 @@ -38,8 +38,6 @@ #include "playlist.h" #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 }; @@ -842,6 +840,7 @@ 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) { @@ -853,6 +852,7 @@ 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,6 +940,7 @@ return TRUE; } +#if 0 /* New on Nov 7: Equalizer */ gboolean audacious_rc_get_eq(RemoteObject *obj, gdouble *preamp, GArray **bands, GError **error) { @@ -1003,6 +1004,7 @@ equalizer_activate(active); return TRUE; } +#endif DBusGProxy *audacious_get_dbus_proxy(void)