totem r5188 - in trunk: . src src/backend

[hadess svn gnome org]

Author: hadess
Date: Wed Feb 27 23:03:00 2008
New Revision: 5188
URL: http://svn.gnome.org/viewvc/totem?rev=5188&view=rev

Log:
2008-02-27  Bastien Nocera  <hadess hadess net>

	* src/backend/bacon-video-widget-gst-0.10.c
	(bacon_video_widget_set_scale_ratio): When a visualisation is
	playing, and we're being asked to resize the window to a scale,
	use the viz size to resize the window (Closes: #341355)

	* src/totem.c (window_state_event_cb): Remove debug



Modified:
   trunk/ChangeLog
   trunk/src/backend/bacon-video-widget-gst-0.10.c
   trunk/src/totem.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	Wed Feb 27 23:03:00 2008
@@ -3595,7 +3595,12 @@
 
   GST_DEBUG ("ratio = %.2f", ratio);
 
-  get_media_size (bvw, &w, &h);
+  if (!bvw->priv->media_has_video && bvw->priv->show_vfx) {
+    get_visualization_size (bvw, &w, &h, NULL, NULL);
+  } else {
+    get_media_size (bvw, &w, &h);
+  }
+
   if (ratio == 0.0) {
     if (totem_ratio_fits_screen (bvw->priv->video_window, w, h, 2.0))
       ratio = 2.0;

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Wed Feb 27 23:03:00 2008
@@ -668,13 +668,11 @@
 
 	if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
 		if (totem->controls_visibility != TOTEM_CONTROLS_UNDEFINED) {
-			g_message ("vis is %d", totem->controls_visibility);
 			totem_action_save_size (totem);
 		}
 		totem_fullscreen_set_fullscreen (totem->fs, TRUE);
 
 		totem->controls_visibility = TOTEM_CONTROLS_FULLSCREEN;
-		g_message ("setting to fullscreen now");
 		show_controls (totem, FALSE);
 		totem_action_set_sensitivity ("fullscreen", FALSE);
 	} else {
@@ -687,10 +685,8 @@
 
 		if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
 			totem->controls_visibility = TOTEM_CONTROLS_VISIBLE;
-			g_message ("vis is %d (is active)", totem->controls_visibility);
 		} else {
 			totem->controls_visibility = TOTEM_CONTROLS_HIDDEN;
-			g_message ("vis is %d (is not active)", totem->controls_visibility);
 		}
 
 		show_controls (totem, TRUE);