? libgnomeui_gstreamer_test.patch
? libgnomeui_gstreamer_v000.patch
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libgnomeui/configure.in,v
retrieving revision 1.202
diff -u -r1.202 configure.in
--- configure.in	1 Mar 2005 14:54:33 -0000	1.202
+++ configure.in	1 Mar 2005 18:32:04 -0000
@@ -17,8 +17,7 @@
 m4_define([libgnomeui_extraversion], [])
 
 dnl Required versions of other packages
-m4_define([esound_required_version],         [0.2.26])
-m4_define([audiofile_required_version],      [0.2.3])
+m4_define([gstreamer_required_version],      [0.8.5])
 m4_define([libgnome_required_version],       [2.0.0])
 m4_define([libgnomecanvas_required_version], [2.0.0])
 m4_define([libbonoboui_required_version],    [2.0.0])
@@ -110,20 +109,16 @@
 dnl Start of pkg-config checks
 dnl
 
-dnl We first check for esound and audiofile (which has conditional
-dnl support built in)
+dnl Here we check whether gstreamer is available
 dnl
-SOUND_MODULES="esound >= esound_required_version dnl
-  audiofile >= audiofile_required_version"
+SOUND_MODULES="gstreamer-0.8 >= gstreamer_required_version"
 PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES], [
-	AC_DEFINE(HAVE_LIBAUDIOFILE, 1,
-                  [Define to 1 if you have libaudiofile installed])
-	AC_DEFINE(HAVE_ESD, 1,
-                  [Define to 1 if you have libesd installed])
-	esd_msg=yes
+	AC_DEFINE(HAVE_GSTREAMER, 1,
+                  [Define to 1 if you have gstreamer installed])
+	gst_msg=yes
 ],[
 	SOUND_MODULES=""
-	esd_msg=no
+	gst_msg=no
 ])
 
 dnl
@@ -248,6 +243,6 @@
 
 AC_OUTPUT
 echo "configuration:
-	esd support: ${esd_msg}
+	gstreamer support: ${gst_msg}
 	doc build:   ${enable_gtk_doc}
 "
Index: libgnomeui/gnome-ui-init.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-ui-init.c,v
retrieving revision 1.194
diff -u -r1.194 gnome-ui-init.c
--- libgnomeui/gnome-ui-init.c	15 Feb 2004 20:43:59 -0000	1.194
+++ libgnomeui/gnome-ui-init.c	1 Mar 2005 18:32:09 -0000
@@ -94,7 +94,7 @@
 /* Prototype for a private gnome_stock function */
 void _gnome_stock_icons_init (void);
 
-#ifdef HAVE_ESD
+#ifdef HAVE_GSTREAMER
 
 /* Whether to make noises when the user clicks a button, etc.  We cache it
  * in a boolean rather than querying GConf every time.
@@ -104,7 +104,7 @@
 /* GConf client for monitoring the event sounds option */
 static GConfClient *gconf_client = NULL;
 
-#endif /* HAVE_ESD */
+#endif /* HAVE_GSTREAMER */
 
 
 enum { ARG_DISABLE_CRASH_DIALOG=1, ARG_DISPLAY };
@@ -293,7 +293,7 @@
                 libgnomeui_segv_setup (app, FALSE);
 }
 
-#ifdef HAVE_ESD
+#ifdef HAVE_GSTREAMER
 static gboolean
 relay_gnome_signal (GSignalInvocationHint *hint,
               	     guint n_param_values,
@@ -345,9 +345,6 @@
                 }
         }
 
-        if (gnome_sound_connection_get () < 0)
-                return TRUE;
-
         gnome_triggers_vdo ("", NULL, (const char **) pieces);
 
         return TRUE;
@@ -400,9 +397,6 @@
       return TRUE;
   }
 
-  if (gnome_sound_connection_get() < 0)
-    return TRUE;
-
   gnome_triggers_vdo("", NULL, (const char **)pieces);
 
   return TRUE;
@@ -488,7 +482,7 @@
 {
         gboolean new_use_event_sounds;
 
-        new_use_event_sounds = (gnome_gconf_get_bool ("/desktop/gnome/sound/enable_esd") &&
+        new_use_event_sounds = (gnome_gconf_get_bool ("/desktop/gnome/sound/enable_sound") &&
                                 gnome_gconf_get_bool ("/desktop/gnome/sound/event_sounds"));
 
         if (new_use_event_sounds && !use_event_sounds) {
@@ -498,12 +492,12 @@
 
         use_event_sounds = new_use_event_sounds;
 }
-#endif
+#endif /* HAVE_GSTREAMER */
 
 static void
 setup_event_listener (void)
 {
-#ifdef HAVE_ESD
+#ifdef HAVE_GSTREAMER
         gconf_client = gconf_client_get_default ();
         if (!gconf_client)
                 return;
@@ -514,18 +508,18 @@
         gconf_client_notify_add (gconf_client, "/desktop/gnome/sound/event_sounds",
                                  event_sounds_changed_cb,
                                  NULL, NULL, NULL);
-        gconf_client_notify_add (gconf_client, "/desktop/gnome/sound/enable_esd",
+        gconf_client_notify_add (gconf_client, "/desktop/gnome/sound/enable_sound",
                                  event_sounds_changed_cb,
                                  NULL, NULL, NULL);
 	
-        use_event_sounds = (gnome_gconf_get_bool ("/desktop/gnome/sound/enable_esd") &&
+        use_event_sounds = (gnome_gconf_get_bool ("/desktop/gnome/sound/enable_sound") &&
                             gnome_gconf_get_bool ("/desktop/gnome/sound/event_sounds"));
 
         if (use_event_sounds) {
                 initialize_gtk_signal_relay ();
                 initialize_gnome_signal_relay ();
 	 }
-#endif
+#endif /* HAVE_GSTREAMER */
 }
 
 static void
