Mercurial > audlegacy
changeset 3503:1319e83dad6a trunk
Automated merge with file:/home/ccr/audacious/core
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 08 Sep 2007 06:47:15 +0300 |
| parents | b413aa0c939c (current diff) 2048a7c9572f (diff) |
| children | 04ecdd1b0e12 |
| files | |
| diffstat | 9 files changed, 3 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/discovery.c Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/discovery.c Sat Sep 08 06:47:15 2007 +0300 @@ -75,13 +75,6 @@ plugin->enabled = enable; } -gboolean -discovery_enabled(gint i) -{ - return (g_list_find(dp_data.enabled_list, - get_discovery_plugin(i)) != NULL); -} - gchar * discovery_stringify_enabled_list(void) {
--- a/src/audacious/discovery.h Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/discovery.h Sat Sep 08 06:47:15 2007 +0300 @@ -44,7 +44,6 @@ GList *get_discovery_list(void); GList *get_discovery_enabled_list(void); void enable_discovery_plugin(gint i, gboolean enable); -gboolean discovery_enabled(gint i); gchar *discovery_stringify_enabled_list(void); void discovery_enable_from_stringified_list(const gchar * list);
--- a/src/audacious/effect.c Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/effect.c Sat Sep 08 06:47:15 2007 +0300 @@ -133,15 +133,6 @@ return ep_data.effect_list; } -gboolean -effect_enabled(int i) -{ - return (g_list_find - (ep_data.enabled_list, - (EffectPlugin *) g_list_nth(ep_data.effect_list, - i)->data) ? TRUE : FALSE); -} - gchar * effect_stringify_enabled_list(void) {
--- a/src/audacious/effect.h Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/effect.h Sat Sep 08 06:47:15 2007 +0300 @@ -38,7 +38,6 @@ GList *get_effect_list(void); GList *get_effect_enabled_list(void); void enable_effect_plugin(gint i, gboolean enable); -gboolean effect_enabled(gint i); gchar *effect_stringify_enabled_list(void); void effect_enable_from_stringified_list(const gchar * list);
--- a/src/audacious/general.c Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/general.c Sat Sep 08 06:47:15 2007 +0300 @@ -75,13 +75,6 @@ plugin->enabled = enable; } -gboolean -general_enabled(gint i) -{ - return (g_list_find(gp_data.enabled_list, - get_general_plugin(i)) != NULL); -} - gchar * general_stringify_enabled_list(void) {
--- a/src/audacious/general.h Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/general.h Sat Sep 08 06:47:15 2007 +0300 @@ -35,7 +35,6 @@ GList *get_general_list(void); GList *get_general_enabled_list(void); void enable_general_plugin(gint i, gboolean enable); -gboolean general_enabled(gint i); gchar *general_stringify_enabled_list(void); void general_enable_from_stringified_list(const gchar * list);
--- a/src/audacious/ui_credits.c Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/ui_credits.c Sat Sep 08 06:47:15 2007 +0300 @@ -43,7 +43,7 @@ }; -static const gchar *bmp_brief = +static const gchar *audacious_brief = N_("<big><b>Audacious %s</b></big>\n" "The future of UNIX multimedia.\n" "\n" @@ -84,6 +84,7 @@ "Daniel Barkalow", "Michael Färber", "Shay Green", + "Matti Hämäläinen", "Giacomo Lozito", "Cristi Măgherușan", "William Pitcock", @@ -383,7 +384,7 @@ g_object_unref(logo_pixbuf); label = gtk_label_new(NULL); - text = g_strdup_printf(_(bmp_brief), VERSION); + text = g_strdup_printf(_(audacious_brief), VERSION); gtk_label_set_markup(GTK_LABEL(label), text); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER); g_free(text);
--- a/src/audacious/visualization.c Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/visualization.c Sat Sep 08 06:47:15 2007 +0300 @@ -124,14 +124,6 @@ vp->enabled = enable; } -gboolean -vis_enabled(gint i) -{ - return (g_list_find - (vp_data.enabled_list, - g_list_nth(vp_data.vis_list, i)->data) != NULL); -} - gchar * vis_stringify_enabled_list(void) {
--- a/src/audacious/visualization.h Sat Sep 08 03:20:38 2007 +0300 +++ b/src/audacious/visualization.h Sat Sep 08 06:47:15 2007 +0300 @@ -43,7 +43,6 @@ void vis_disable_plugin(VisPlugin * vp); void vis_playback_start(void); void vis_playback_stop(void); -gboolean vis_enabled(gint i); gchar *vis_stringify_enabled_list(void); void vis_enable_from_stringified_list(gchar * list); void vis_send_data(gint16 pcm_data[2][512], gint nch, gint length);