totem r5425 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Sat May 24 10:48:06 2008
New Revision: 5425
URL: http://svn.gnome.org/viewvc/totem?rev=5425&view=rev

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

	* src/totem-playlist.c (init_treeview):
	* src/totem-playlist.h:
	* src/totem.c (on_playlist_change_name): Remove dead-code dating
	back from the audio CD support times



Modified:
   trunk/ChangeLog
   trunk/src/totem-playlist.c
   trunk/src/totem-playlist.h
   trunk/src/totem.c

Modified: trunk/src/totem-playlist.c
==============================================================================
--- trunk/src/totem-playlist.c	(original)
+++ trunk/src/totem-playlist.c	Sat May 24 10:48:06 2008
@@ -136,9 +136,6 @@
 	FILENAME_COL,
 	URI_COL,
 	TITLE_CUSTOM_COL,
-	CACHE_TITLE_COL,
-	CACHE_ARTIST_COL,
-	CACHE_ALBUM_COL,
 	SUBTITLE_URI_COL,
 	NUM_COLS
 };
@@ -1312,9 +1309,6 @@
 				G_TYPE_STRING,
 				G_TYPE_STRING,
 				G_TYPE_BOOLEAN,
-				G_TYPE_STRING,
-				G_TYPE_STRING,
-				G_TYPE_STRING,
 				G_TYPE_STRING));
 
 	/* the treeview */
@@ -1955,34 +1949,6 @@
 }
 
 gboolean
-totem_playlist_get_current_metadata (TotemPlaylist *playlist,
-				     char         **artist,
-				     char         **title,
-				     char         **album)
-{
-	GtkTreeIter iter;
-
-        g_return_val_if_fail (TOTEM_IS_PLAYLIST (playlist), FALSE);
-
-	if (update_current_from_playlist (playlist) == FALSE)
-		return FALSE;
-
-	gtk_tree_model_get_iter (playlist->priv->model,
-				 &iter,
-				 playlist->priv->current);
-
-	*artist = NULL;
-	gtk_tree_model_get (playlist->priv->model,
-			    &iter,
-			    CACHE_ARTIST_COL, artist,
-			    CACHE_TITLE_COL, title,
-			    CACHE_ALBUM_COL, album,
-			    -1);
-
-	return (*artist != NULL);
-}
-
-gboolean
 totem_playlist_has_previous_mrl (TotemPlaylist *playlist)
 {
 	GtkTreeIter iter;

Modified: trunk/src/totem-playlist.h
==============================================================================
--- trunk/src/totem-playlist.h	(original)
+++ trunk/src/totem-playlist.h	Sat May 24 10:48:06 2008
@@ -105,10 +105,6 @@
 char      *totem_playlist_get_title (TotemPlaylist *playlist,
 				     guint index);
 
-gboolean   totem_playlist_get_current_metadata (TotemPlaylist *playlist,
-						char         **artist,
-						char         **title,
-						char         **album);
 gboolean   totem_playlist_set_title (TotemPlaylist *playlist,
 				     const char *title,
 				     gboolean force);

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Sat May 24 10:48:06 2008
@@ -1672,15 +1672,6 @@
 		update_mrl_label (totem, name);
 		g_free (name);
 	}
-
-	if (totem_playlist_get_current_metadata (playlist, &artist,
-						 &title, &album) != FALSE) {
-		totem_metadata_updated (totem, artist, title, album);
-
-		g_free (artist);
-		g_free (album);
-		g_free (title);
-	}
 }
 
 static void