totem r5829 - in trunk: . src src/backend

[hadess svn gnome org]

Author: hadess
Date: Fri Dec  5 17:24:54 2008
New Revision: 5829
URL: http://svn.gnome.org/viewvc/totem?rev=5829&view=rev

Log:
2008-12-05  Bastien Nocera  <hadess hadess net>

	* src/backend/bacon-video-widget-gst-0.10.c
	(bacon_video_widget_set_show_visuals):
	* src/backend/bacon-video-widget-xine.c
	(bacon_video_widget_set_show_visuals):
	* src/backend/bacon-video-widget.h:
	* src/totem-preferences.c (totem_prefs_set_show_visuals),
	(checkbutton2_toggled_cb), (totem_setup_preferences):
	Remove retval from bacon_video_widget_set_show_visuals()
	as both backends can switch visuals on-the-fly



Modified:
   trunk/ChangeLog
   trunk/src/backend/bacon-video-widget-gst-0.10.c
   trunk/src/backend/bacon-video-widget-xine.c
   trunk/src/backend/bacon-video-widget.h
   trunk/src/totem-preferences.c

Modified: trunk/src/backend/bacon-video-widget-gst-0.10.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-gst-0.10.c	(original)
+++ trunk/src/backend/bacon-video-widget-gst-0.10.c	Fri Dec  5 17:24:54 2008
@@ -3400,18 +3400,16 @@
   return;
 }
 
-gboolean
+void
 bacon_video_widget_set_show_visuals (BaconVideoWidget * bvw,
                                      gboolean show_visuals)
 {
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+  g_return_if_fail (bvw != NULL);
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
 
   bvw->priv->show_vfx = show_visuals;
   bvw->priv->vis_changed = TRUE;
-  
-  return TRUE;
 }
 
 static gboolean

Modified: trunk/src/backend/bacon-video-widget-xine.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-xine.c	(original)
+++ trunk/src/backend/bacon-video-widget-xine.c	Fri Dec  5 17:24:54 2008
@@ -3096,18 +3096,16 @@
 	return xine_get_param (bvw->priv->stream, XINE_PARAM_VO_DEINTERLACE);
 }
 
-gboolean
+void
 bacon_video_widget_set_show_visuals (BaconVideoWidget *bvw,
 		gboolean show_visuals)
 {
-	g_return_val_if_fail (bvw != NULL, FALSE);
-	g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-	g_return_val_if_fail (bvw->priv->xine != NULL, FALSE);
+	g_return_if_fail (bvw != NULL);
+	g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+	g_return_if_fail (bvw->priv->xine != NULL);
 
 	bvw->priv->show_vfx = show_visuals;
 	show_vfx_update (bvw, show_visuals);
-
-	return TRUE;
 }
 
 GList *

Modified: trunk/src/backend/bacon-video-widget.h
==============================================================================
--- trunk/src/backend/bacon-video-widget.h	(original)
+++ trunk/src/backend/bacon-video-widget.h	Fri Dec  5 17:24:54 2008
@@ -220,7 +220,7 @@
 	NUM_VISUAL_QUALITIES
 } VisualsQuality;
 
-gboolean bacon_video_widget_set_show_visuals	  (BaconVideoWidget *bvw,
+void bacon_video_widget_set_show_visuals	  (BaconVideoWidget *bvw,
 						   gboolean show_visuals);
 GList *bacon_video_widget_get_visuals_list	  (BaconVideoWidget *bvw);
 gboolean bacon_video_widget_set_visuals		  (BaconVideoWidget *bvw,

Modified: trunk/src/totem-preferences.c
==============================================================================
--- trunk/src/totem-preferences.c	(original)
+++ trunk/src/totem-preferences.c	Fri Dec  5 17:24:54 2008
@@ -131,7 +131,7 @@
 }
 
 static void
-totem_prefs_set_show_visuals (Totem *totem, gboolean value, gboolean warn)
+totem_prefs_set_show_visuals (Totem *totem, gboolean value)
 {
 	GtkWidget *item;
 
@@ -149,21 +149,8 @@
 			"tpw_visuals_size_combobox"));
 	gtk_widget_set_sensitive (item, value);
 
-	if (warn == FALSE)
-	{
-		bacon_video_widget_set_show_visuals
-			(BACON_VIDEO_WIDGET (totem->bvw), value);
-		return;
-	}
-
-	if (bacon_video_widget_set_show_visuals
-			(BACON_VIDEO_WIDGET (totem->bvw), value) == FALSE)
-	{
-		totem_action_info (_("The change of this setting will only "
-					"take effect for the next movie, or "
-					"when Totem is restarted."),
-				totem);
-	}
+	bacon_video_widget_set_show_visuals
+		(BACON_VIDEO_WIDGET (totem->bvw), value);
 }
 
 void
@@ -184,7 +171,7 @@
 		}
 	}
 
-	totem_prefs_set_show_visuals (totem, value, TRUE);
+	totem_prefs_set_show_visuals (totem, value);
 }
 
 void
@@ -592,7 +579,7 @@
 	g_signal_handlers_disconnect_by_func (item, checkbutton2_toggled_cb, totem);
 	gtk_toggle_button_set_active
 		(GTK_TOGGLE_BUTTON (item), show_visuals);
-	totem_prefs_set_show_visuals (totem, show_visuals, FALSE);
+	totem_prefs_set_show_visuals (totem, show_visuals);
 	g_signal_connect (item, "toggled", G_CALLBACK (checkbutton2_toggled_cb), totem);
 
 	gconf_client_notify_add (totem->gc, GCONF_PREFIX"/show_vfx",