changeset
[gaim-migrate @ 17682]
Mon, 06 Nov 2006 07:38:05 +0000
- author
- Ari Pollak <ari@debian.org>
- date
- Mon, 06 Nov 2006 07:38:05 +0000
- changeset 14972
- 053c6beb8958
- parent 14971
- 715622abfe5f
- child 14973
- b337db5b4756
[gaim-migrate @ 17682]
sf patch #1591071, from Ari Pollak
"This patch disables the seemingly obsolete NAS and arts
sound options since they're not provided in gstreamer
0.10. It also falls back more gracefully if we can't
get a proper GStreamer audiosink."
We're currently only using gconfaudiosink if the user
is running within Gnome. Do we want to keep doing that?
committer: Mark Doliner <markdoliner@pidgin.im>
| gtk/gtkprefs.c | file | annotate | diff | comparison | revisions | |
| gtk/gtksound.c | file | annotate | diff | comparison | revisions |
--- a/gtk/gtkprefs.c Mon Nov 06 07:25:05 2006 +0000 +++ b/gtk/gtkprefs.c Mon Nov 06 07:38:05 2006 +0000 @@ -1403,10 +1403,8 @@ const char *method = value; gtk_widget_set_sensitive(hbox, - !strcmp(method, "automatic") || - !strcmp(method, "arts") || - !strcmp(method, "esd") || - !strcmp(method, "nas")); + !strcmp(method, "automatic") || + !strcmp(method, "esd")); } #endif /* USE_GSTREAMER */ #endif /* !_WIN32 */ @@ -1595,9 +1593,7 @@ _("Console beep"), "beep", #ifdef USE_GSTREAMER _("Automatic"), "automatic", - "Arts", "arts", "ESD", "esd", - "NAS", "nas", #endif _("Command"), "custom", _("No sounds"), "none",
--- a/gtk/gtksound.c Mon Nov 06 07:25:05 2006 +0000 +++ b/gtk/gtksound.c Mon Nov 06 07:38:05 2006 +0000 @@ -451,12 +451,10 @@ if (gaim_running_gnome()) { sink = gst_element_factory_make("gconfaudiosink", "sink"); } + if (!sink) + sink = gst_element_factory_make("autoaudiosink", "sink"); } else if (!strcmp(method, "esd")) { sink = gst_element_factory_make("esdsink", "sink"); - } else if (!strcmp(method, "arts")) { - sink = gst_element_factory_make("artssink", "sink"); - } else if (!strcmp(method, "nas")) { - sink = gst_element_factory_make("nassink", "sink"); } uri = g_strdup_printf("file://%s", filename);
