totem r5511 - in trunk: . src src/backend

[hadess svn gnome org]

Author: hadess
Date: Thu Jul 17 22:08:28 2008
New Revision: 5511
URL: http://svn.gnome.org/viewvc/totem?rev=5511&view=rev

Log:
2008-07-17  Bastien Nocera  <hadess hadess net>

	* src/backend/bacon-video-widget-xine.c
	(bacon_video_widget_realize), (bacon_video_widget_set_zoom):
	Apply the zoom level even if there's no stream yet
	* src/totem.c (totem_action_zoom_reset): Make sure that we
	use the zoom constants rather than some hard coded numbers



Modified:
   trunk/ChangeLog
   trunk/src/backend/bacon-video-widget-xine.c
   trunk/src/totem.c

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	Thu Jul 17 22:08:28 2008
@@ -182,6 +182,7 @@
 	BaconVideoWidgetAudioOutType audio_out_type;
 	TvOutType tvout;
 	gint64 stream_length;
+	int zoom;
 
 	GAsyncQueue *queue;
 	int video_width, video_height;
@@ -1252,6 +1253,10 @@
 	setup_config_stream (bvw);
 	bvw->priv->ev_queue = xine_event_new_queue (bvw->priv->stream);
 
+	/* Set the zoom that might have been recorded */
+	if (bvw->priv->zoom != 0)
+		bacon_video_widget_set_zoom (bvw, bvw->priv->zoom);
+
 	/* Setup xine events */
 	xine_event_create_listener_thread (bvw->priv->ev_queue,
 			xine_event, (void *) bvw);
@@ -3713,8 +3718,11 @@
 	g_return_if_fail (bvw->priv->xine != NULL);
 	g_return_if_fail (zoom >= 0 && zoom <= 400);
 
-	if (bvw->priv->stream == NULL)
+	if (bvw->priv->stream == NULL) {
+		/* No stream yet, remember the zoom level */
+		bvw->priv->zoom = zoom;
 		return;
+	}
 
 	xine_set_param (bvw->priv->stream,
 			XINE_PARAM_VO_ZOOM_X, zoom);

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Thu Jul 17 22:08:28 2008
@@ -1348,7 +1348,7 @@
 void
 totem_action_zoom_reset (Totem *totem)
 {
-	totem_action_zoom (totem, 100);
+	totem_action_zoom (totem, ZOOM_RESET);
 }
 
 /**