sound-juicer r2504 - in trunk: . libjuicer

[rburton svn gnome org]

Author: rburton
Date: Mon Apr  6 16:30:23 2009
New Revision: 2504
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2504&view=rev

Log:
2009-04-06  Ross Burton  <ross linux intel com>

	* configure.in:
	Require a recent libmusicbrainz3.
	
	* libjuicer/sj-metadata-musicbrainz3.c:
	Read the track artist for each track, not the release
	artist (#576574).  Thanks Jonathan Matthew.


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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Apr  6 16:30:23 2009
@@ -81,7 +81,7 @@
 fi
 
 # Find optional MusicBrainz3 and required Musicbrainz2
-PKG_CHECK_MODULES(MUSICBRAINZ3, libmusicbrainz3, [have_mb3=yes], [have_mb3=no])
+PKG_CHECK_MODULES(MUSICBRAINZ3, libmusicbrainz3 >= 3.0.2, [have_mb3=yes], [have_mb3=no])
 AC_SUBST(MUSICBRAINZ3_CFLAGS)
 AC_SUBST(MUSICBRAINZ3_LIBS)
 AM_CONDITIONAL([HAVE_MUSICBRAINZ3], [test "$have_mb3" = "yes"])

Modified: trunk/libjuicer/sj-metadata-musicbrainz3.c
==============================================================================
--- trunk/libjuicer/sj-metadata-musicbrainz3.c	(original)
+++ trunk/libjuicer/sj-metadata-musicbrainz3.c	Mon Apr  6 16:30:23 2009
@@ -172,7 +172,9 @@
     GET (track->title, mb_track_get_title, mbt);
     track->duration = mb_track_get_duration (mbt) / 1000;
 
-    artist = mb_release_get_artist (release);
+    artist = mb_track_get_artist (mbt);
+    if (artist == NULL)
+      artist = mb_release_get_artist (release);
     GET (track->artist_id, mb_artist_get_id, artist);
     GET (track->artist, mb_artist_get_name, artist);
     GET (track->artist_sortname, mb_artist_get_sortname, artist);