totem r5474 - in trunk: . src src/backend

[hadess svn gnome org]

Author: hadess
Date: Wed Jun 18 10:46:11 2008
New Revision: 5474
URL: http://svn.gnome.org/viewvc/totem?rev=5474&view=rev

Log:
2008-06-18  Bastien Nocera  <hadess hadess net>

	* README:
	* src/totem.c (totem_action_open_files_list),
	(totem_action_remote), (totem_action_handle_key_press):
	'+' and '-' on their own can now be used to go to the next/previous
	track, Force playback when using DVB, otherwise playback won't
	autostart

	* src/backend/bacon-video-widget-gst-0.10.c
	(bacon_video_widget_get_metadata): Fix warning when fetching cover art

	* src/backend/bacon-video-widget-xine.c (xine_event_message),
	(bacon_video_widget_get_metadata): As above, and also try to give a
	better error message when TV signal is lost

	* src/totem-video-thumbnailer.c: Always have --g-fatal-warnings
	enabled



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

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Wed Jun 18 10:46:11 2008
@@ -68,9 +68,9 @@
 	DVD Action Left
 Keypad Right / Keypad 6:
 	DVD Action Right
-B, Alt+Left arrow:
+B, Alt+Left arrow, Minus key:
 	Previous stream (Back)
-N, Alt+Right arrow:
+N, Alt+Right arrow, Plus key:
 	Next stream (Next)
 Ctrl+Q:
 	Quit

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 Jun 18 10:46:11 2008
@@ -4671,7 +4671,7 @@
       {
         const GValue *cover_value;
 
-	g_value_init (value, GDK_TYPE_PIXBUF);
+	g_value_init (value, G_TYPE_OBJECT);
 
         if (bvw->priv->tagcache == NULL)
           break;

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	Wed Jun 18 10:46:11 2008
@@ -1340,7 +1340,11 @@
 	case XINE_MSG_NO_ERROR:
 		return;
 	case XINE_MSG_GENERAL_WARNING:
-		return;
+		if (data->messages != NULL && strcmp (data->messages, "DVB Signal Lost.  Please check connections.") == 0) {
+			num = BVW_ERROR_INVALID_DEVICE;
+			message = g_strdup (_("The TV adapter could not tune into the channel. Please check your hardware setup, and channel configuration."));
+		}
+		break;
 	case XINE_MSG_UNKNOWN_HOST:
 		num = BVW_ERROR_UNKNOWN_HOST;
 		message = g_strdup (_("The server you are trying to connect to is not known."));
@@ -4034,7 +4038,7 @@
 		bacon_video_widget_get_metadata_bool (bvw, type, value);
 		break;
 	case BVW_INFO_COVER:
-		g_value_init (value, GDK_TYPE_PIXBUF);
+		g_value_init (value, G_TYPE_OBJECT);
 		break;
 	default:
 		g_assert_not_reached ();

Modified: trunk/src/totem-video-thumbnailer.c
==============================================================================
--- trunk/src/totem-video-thumbnailer.c	(original)
+++ trunk/src/totem-video-thumbnailer.c	Wed Jun 18 10:46:11 2008
@@ -464,9 +464,7 @@
 	{ "no-limit", 'l', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &time_limit, "Don't limit the thumbnailing time to 30 seconds", NULL },
 	{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Output debug information", NULL },
 	{ "time", 't', 0, G_OPTION_ARG_INT64, &second_index, "Choose this time (in seconds) as the thumbnail", NULL },
-#ifndef THUMB_DEBUG
 	{"g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, "Make all warnings fatal", NULL},
-#endif /* THUMB_DEBUG */
  	{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, "[FILE...]" },
 	{ NULL }
 };

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Wed Jun 18 10:46:11 2008
@@ -1960,7 +1960,8 @@
 				totem_playlist_add_mrl (totem->playlist, data, NULL);
 				changed = TRUE;
 			} else if (g_str_equal (filename, "dvb:") != FALSE) {
-				changed = totem_action_load_media (totem, MEDIA_TYPE_DVB, NULL);
+				totem_action_play_media (totem, MEDIA_TYPE_DVB, "0");
+				changed = TRUE;
 			} else if (totem_playlist_add_mrl (totem->playlist, filename, NULL) != FALSE) {
 				totem_action_add_recent (totem, filename);
 				changed = TRUE;
@@ -2185,7 +2186,7 @@
 			/* FIXME b0rked */
 			totem_action_play_media (totem, MEDIA_TYPE_VCD, NULL);
 		} else if (g_str_has_prefix (url, "dvb:") != FALSE) {
-			totem_action_play_media (totem, MEDIA_TYPE_DVB, NULL);
+			totem_action_play_media (totem, MEDIA_TYPE_DVB, "0");
 		} else if (totem_playlist_add_mrl_with_cursor (totem->playlist, url, NULL) != FALSE) {
 			totem_action_add_recent (totem, url);
 		}
@@ -2755,17 +2756,19 @@
 		break;
 	case GDK_plus:
 	case GDK_KP_Add:
-		if (!(event->state & GDK_CONTROL_MASK))
-			return FALSE;
-
-		totem_action_zoom_relative (totem, ZOOM_IN_OFFSET);
+		if (!(event->state & GDK_CONTROL_MASK)) {
+			totem_action_next (totem);
+		} else {
+			totem_action_zoom_relative (totem, ZOOM_IN_OFFSET);
+		}
 		break;
 	case GDK_minus:
 	case GDK_KP_Subtract:
-		if (!(event->state & GDK_CONTROL_MASK))
-			return FALSE;
-
-		totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET);
+		if (!(event->state & GDK_CONTROL_MASK)) {
+			totem_action_previous (totem);
+		} else {
+			totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET);
+		}
 		break;
 	case GDK_KP_Up:
 	case GDK_KP_8: