gnome-media r3811 - in trunk/grecord: . src

[malureau svn gnome org]

Author: malureau
Date: Sun Mar 23 13:00:20 2008
New Revision: 3811
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3811&view=rev

Log:
2008-03-23  Marc-Andre Lureau  <marcandre lureau gmail com>

	* src/gsr-window.c (make_record_source, fill_record_input): Accept
	audio sources that do not implement GST_MIXER.


Modified:
   trunk/grecord/ChangeLog
   trunk/grecord/src/gsr-window.c

Modified: trunk/grecord/src/gsr-window.c
==============================================================================
--- trunk/grecord/src/gsr-window.c	(original)
+++ trunk/grecord/src/gsr-window.c	Sun Mar 23 13:00:20 2008
@@ -1817,12 +1817,6 @@
 	}
 	window->priv->source = source;
 	e = gst_bin_get_by_interface (GST_BIN (source), GST_TYPE_MIXER);
-	if (GST_IS_MIXER (e) == FALSE) {
-		show_error_dialog (NULL, NULL,
-			_("Your audio capture settings are invalid. "
-			  "Please correct them in the Multimedia settings."));
-		return FALSE;
-	}
 	window->priv->mixer = GST_MIXER (e);
 
 	return TRUE;
@@ -1891,7 +1885,12 @@
 	if (model) 
 		gtk_list_store_clear (GTK_LIST_STORE (model));
 	
-	g_return_if_fail (GST_IS_MIXER (window->priv->mixer));
+	if (GST_IS_MIXER (window->priv->mixer) == NULL) {
+		gtk_widget_set_sensitive (window->priv->input, FALSE);
+		return;
+	} else {
+		gtk_widget_set_sensitive (window->priv->input, TRUE);
+	}
 
 	for (l = gst_mixer_list_tracks (window->priv->mixer); l != NULL; l = l->next) {
 		GstMixerTrack *t = l->data;