gnome-settings-daemon r379 - in trunk: . plugins/sound

[walters svn gnome org]

Author: walters
Date: Tue Jun 17 18:38:01 2008
New Revision: 379
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=379&view=rev

Log:
2008-06-17  Colin Walters <walters verbum org>

	http://bugzilla.gnome.org/show_bug.cgi?id=533198

	* configure.ac: Detect PulseAudio at build time; if available,
	default to always starting it (ignore the legacy esd GConf
	key /desktop/gnome/sound/enable_esd).  If you're a system
	administrator or OS builder and want to disable PulseAudio,
	you should preferably figure out what the problem you have
	with it is; but failing that, just remove it from the install
	image.
	* plugins/sound/gsd-sound-manager.c: If we're not compiled with
	legacy sound pref, always start sound.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/sound/gsd-sound-manager.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jun 17 18:38:01 2008
@@ -326,6 +326,23 @@
 AM_CONDITIONAL(HAVE_ALSA, test x"$have_alsa" = "xyes")
 
 # ---------------------------------------------------------------------------
+# Enable Legacy Sound Preference
+# ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(PULSEAUDIO, libpulse, have_pulseaudio=yes, AC_MSG_RESULT([no]))
+if test x$have_pulseaudio = xyes; then
+	default_enable_legacy_sound_pref=no
+else
+	default_enable_legacy_sound_pref=yes
+fi
+AC_ARG_ENABLE(legacy-sound-pref,
+	[AC_HELP_STRING([--enable-legacy-sound-pref],
+	[check for preference to start ESD])],
+	,enable_legacy_sound_pref=$default_enable_legacy_sound_pref)
+if test "x$enable_legacy_sound_pref" = "xyes"; then
+    AC_DEFINE(ENABLE_LEGACY_SOUND_PREF,1,[enable preference for ESD startup])
+fi
+
+# ---------------------------------------------------------------------------
 # Enable Profiling
 # ---------------------------------------------------------------------------
 AC_ARG_ENABLE(profiling,

Modified: trunk/plugins/sound/gsd-sound-manager.c
==============================================================================
--- trunk/plugins/sound/gsd-sound-manager.c	(original)
+++ trunk/plugins/sound/gsd-sound-manager.c	Tue Jun 17 18:38:01 2008
@@ -294,7 +294,18 @@
 
         client = gconf_client_get_default ();
 
+	/* The "preference" here was just around because ESD introduced tradeoffs and was generally
+           poor software.  Pulseaudio is better and notably releases the sound device when not in
+           use, so should have no impact for legacy applications.  The reason we don't actually want
+           to even read from the preference is because someone may have set it to false intending
+           to disable ESD, but they will then disable Pulseaudio later.  
+           https://bugzilla.redhat.com/show_bug.cgi?id=430624
+        */
+#ifdef ENABLE_LEGACY_SOUND_PREF
         enable_sound = gconf_client_get_bool (client, "/desktop/gnome/sound/enable_esd", NULL);
+#else
+	enable_sound = TRUE;
+#endif
         event_sounds = gconf_client_get_bool (client, "/desktop/gnome/sound/event_sounds", NULL);
 
         closure.enable_system_sounds = event_sounds;