[Gaim-commits] SF.net SVN: gaim: [17682] trunk/gtk

[<the...@us...>]

Revision: 17682
          http://svn.sourceforge.net/gaim/?rev=17682&view=rev
Author:   thekingant
Date:     2006-11-05 23:38:05 -0800 (Sun, 05 Nov 2006)

Log Message:
-----------
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?

Modified Paths:
--------------
    trunk/gtk/gtkprefs.c
    trunk/gtk/gtksound.c

Modified: trunk/gtk/gtkprefs.c
===================================================================
--- trunk/gtk/gtkprefs.c	2006-11-06 07:25:05 UTC (rev 17681)
+++ trunk/gtk/gtkprefs.c	2006-11-06 07:38:05 UTC (rev 17682)
@@ -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",

Modified: trunk/gtk/gtksound.c
===================================================================
--- trunk/gtk/gtksound.c	2006-11-06 07:25:05 UTC (rev 17681)
+++ trunk/gtk/gtksound.c	2006-11-06 07:38:05 UTC (rev 17682)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.