Mercurial > audlegacy
changeset 4576:3789057a3f4f
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 21 May 2008 15:55:45 +0300 |
| parents | 744953f257fb (diff) 92952061147d (current diff) |
| children | c2d739b4c84d |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/dbus-service.h Wed May 21 15:55:19 2008 +0300 +++ b/src/audacious/dbus-service.h Wed May 21 15:55:45 2008 +0300 @@ -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 */
--- a/src/audacious/dbus.c Wed May 21 15:55:19 2008 +0300 +++ b/src/audacious/dbus.c Wed May 21 15:55:45 2008 +0300 @@ -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)