sound-juicer r2295 - in trunk: . libjuicer

[rburton svn gnome org]

Author: rburton
Date: Fri Sep  5 13:18:15 2008
New Revision: 2295
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2295&view=rev

Log:
2008-09-05  Ross Burton  <ross burtonini com>

	* libjuicer/sj-metadata-musicbrainz3.c:
	* libjuicer/sj-metadata-cdtext.c:
	Don't store the album list in a private field any more (not
	required now), and especially don't free it when the app is still
	using it.


Modified:
   trunk/ChangeLog
   trunk/libjuicer/sj-metadata-cdtext.c
   trunk/libjuicer/sj-metadata-musicbrainz3.c

Modified: trunk/libjuicer/sj-metadata-cdtext.c
==============================================================================
--- trunk/libjuicer/sj-metadata-cdtext.c	(original)
+++ trunk/libjuicer/sj-metadata-cdtext.c	Fri Sep  5 13:18:15 2008
@@ -39,7 +39,6 @@
 
 struct SjMetadataCdtextPrivate {
   char *cdrom;
-  GList *albums;
 };
 
 #define GET_PRIVATE(o)  \
@@ -80,11 +79,10 @@
   if (!cdio) {
     g_warning ("Cannot open CD");
     g_set_error (error, SJ_ERROR, SJ_ERROR_INTERNAL_ERROR, _("Cannot read CD"));
-    priv->albums = NULL;
     return NULL;
   }
 
-  album = g_new0(AlbumDetails, 1);
+  album = g_new0 (AlbumDetails, 1);
 
   /* TODO: why can't I do this first? */
   cdtext = cdio_get_cdtext(cdio, 0);
@@ -124,9 +122,7 @@
     album->number++;
   }
 
-  priv->albums = g_list_append (NULL, album);
-
-  return priv->albums;
+  return g_list_append (NULL, album);
 }
 
 
@@ -185,7 +181,6 @@
 {
   SjMetadataCdtextPrivate *priv = SJ_METADATA_CDTEXT (object)->priv;
   g_free (priv->cdrom);
-  g_list_deep_free (priv->albums, (GFunc)album_details_free);
 }
 
 static void

Modified: trunk/libjuicer/sj-metadata-musicbrainz3.c
==============================================================================
--- trunk/libjuicer/sj-metadata-musicbrainz3.c	(original)
+++ trunk/libjuicer/sj-metadata-musicbrainz3.c	Fri Sep  5 13:18:15 2008
@@ -55,7 +55,6 @@
   MbWebService mb;
   MbDisc disc;
   char *cdrom;
-  GList *albums;
   /* Proxy */
   char *http_proxy;
   int http_proxy_port;
@@ -213,6 +212,7 @@
 mb_list_albums (SjMetadata *metadata, char **url, GError **error)
 {
   SjMetadataMusicbrainz3Private *priv;
+  GList *albums = NULL;
   MbQuery query;
   MbReleaseFilter filter;
   MbResultList results;
@@ -225,7 +225,6 @@
   priv = GET_PRIVATE (metadata);
 
   if (sj_metadata_helper_check_media (priv->cdrom, error) == FALSE) {
-    priv->albums = NULL;
     return NULL;
   }
 
@@ -268,13 +267,13 @@
     album = make_album_from_release (release);
     album->metadata_source = SOURCE_MUSICBRAINZ;
     fill_empty_durations (priv->disc, album);
-    priv->albums = g_list_append (priv->albums, album);
+    albums = g_list_append (albums, album);
     mb_release_free (release);
   }
   mb_result_list_free (results);
   mb_query_free (query);
 
-  return priv->albums;
+  return albums;
 }
 
 /*