totem r5980 - in trunk: . src/plugins/properties

[hadess svn gnome org]

Author: hadess
Date: Mon Feb 16 14:26:17 2009
New Revision: 5980
URL: http://svn.gnome.org/viewvc/totem?rev=5980&view=rev

Log:
2009-02-16  Bastien Nocera  <hadess hadess net>

	* src/plugins/properties/bacon-video-widget-properties.c:
	* src/plugins/properties/bacon-video-widget-properties.h:
	* src/plugins/properties/totem-movie-properties.c
	(totem_movie_properties_plugin_metadata_updated): Patch from
	Robin Stocker <robin nibor org> to display metadata again
	after recent changes (Closes: #570830)



Modified:
   trunk/ChangeLog
   trunk/src/plugins/properties/bacon-video-widget-properties.c
   trunk/src/plugins/properties/bacon-video-widget-properties.h
   trunk/src/plugins/properties/totem-movie-properties.c

Modified: trunk/src/plugins/properties/bacon-video-widget-properties.c
==============================================================================
--- trunk/src/plugins/properties/bacon-video-widget-properties.c	(original)
+++ trunk/src/plugins/properties/bacon-video-widget-properties.c	Mon Feb 16 14:26:17 2009
@@ -260,23 +260,6 @@
 #undef UPDATE_FROM_INT2
 }
 
-void
-bacon_video_widget_properties_from_metadata (BaconVideoWidgetProperties *props,
-					     const char *artist,
-					     const char *title,
-					     const char *album)
-{
-	g_return_if_fail (props != NULL);
-	g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
-
-	if (title != NULL)
-		bacon_video_widget_properties_set_label (props, "title", title);
-	if (artist != NULL)
-		bacon_video_widget_properties_set_label (props, "artist", artist);
-	if (album != NULL)
-		bacon_video_widget_properties_set_label (props, "album", album);
-}
-
 GtkWidget*
 bacon_video_widget_properties_new (void)
 {

Modified: trunk/src/plugins/properties/bacon-video-widget-properties.h
==============================================================================
--- trunk/src/plugins/properties/bacon-video-widget-properties.h	(original)
+++ trunk/src/plugins/properties/bacon-video-widget-properties.h	Mon Feb 16 14:26:17 2009
@@ -50,10 +50,6 @@
 void bacon_video_widget_properties_reset		(BaconVideoWidgetProperties *props);
 void bacon_video_widget_properties_update		(BaconVideoWidgetProperties *props,
 							 GtkWidget *bvw);
-void bacon_video_widget_properties_from_metadata	(BaconVideoWidgetProperties *props,
-							 const char *title,
-							 const char *artist,
-							 const char *album);
 void bacon_video_widget_properties_from_time		(BaconVideoWidgetProperties *props,
 							 int time);
 

Modified: trunk/src/plugins/properties/totem-movie-properties.c
==============================================================================
--- trunk/src/plugins/properties/totem-movie-properties.c	(original)
+++ trunk/src/plugins/properties/totem-movie-properties.c	Mon Feb 16 14:26:17 2009
@@ -128,19 +128,12 @@
 						guint track_num,
 						TotemMoviePropertiesPlugin *plugin)
 {
-	if (artist == NULL && title == NULL && album == NULL) {
-		GtkWidget *bvw;
-
-		bvw = totem_get_video_widget (totem);
-		bacon_video_widget_properties_update
-			(BACON_VIDEO_WIDGET_PROPERTIES (plugin->props), bvw);
-		g_object_unref (bvw);
-	} else {
-		bacon_video_widget_properties_from_metadata
-			(BACON_VIDEO_WIDGET_PROPERTIES (plugin->props),
-			 artist, title, album);
-	}
+	GtkWidget *bvw;
 
+	bvw = totem_get_video_widget (totem);
+	bacon_video_widget_properties_update
+		(BACON_VIDEO_WIDGET_PROPERTIES (plugin->props), bvw);
+	g_object_unref (bvw);
 }
 
 static gboolean