sound-juicer r2432 - in trunk: . libjuicer

[rburton svn gnome org]

Author: rburton
Date: Tue Feb 10 21:28:36 2009
New Revision: 2432
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2432&view=rev

Log:
2009-02-10  Ross Burton  <ross linux intel com>

	* configure.in:
	Require GStreamer 0.10.15.

	* libjuicer/sj-extracting.c:
	Don't use GST_TAG_MUSICBRAINZ_SORTNAME, instead use
	ARTIST_SORTNAME. Also assume the Musicbrainz tags exist.


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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Feb 10 21:28:36 2009
@@ -56,7 +56,7 @@
 AC_SUBST(UI_CFLAGS)
 AC_SUBST(UI_LIBS)
 
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.5 gstreamer-plugins-base-0.10)
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.15 gstreamer-plugins-base-0.10)
 AC_SUBST(GSTREAMER_CFLAGS)
 AC_SUBST(GSTREAMER_LIBS)
 

Modified: trunk/libjuicer/sj-extractor.c
==============================================================================
--- trunk/libjuicer/sj-extractor.c	(original)
+++ trunk/libjuicer/sj-extractor.c	Tue Feb 10 21:28:36 2009
@@ -518,13 +518,13 @@
                                GST_TAG_MERGE_REPLACE_ALL,
                                GST_TAG_TITLE, track->title,
                                GST_TAG_ARTIST, track->artist,
+                               GST_TAG_ARTIST_SORTNAME, track->artist_sortname,
                                GST_TAG_TRACK_NUMBER, track->number,
                                GST_TAG_TRACK_COUNT, track->album->number,
                                GST_TAG_ALBUM, track->album->title,
                                GST_TAG_DURATION, track->duration * GST_SECOND,
                                NULL);
 
-#ifdef GST_TAG_MUSICBRAINZ_ALBUMID
       if (track->album->album_id != NULL && strcmp (track->album->album_id, "") != 0) {
         gst_tag_setter_add_tags (tagger,
                             GST_TAG_MERGE_APPEND,
@@ -549,13 +549,6 @@
                             GST_TAG_MUSICBRAINZ_TRACKID, track->track_id,
                             NULL);
       }
-      if (track->artist_sortname != NULL && strcmp (track->artist_sortname, "") != 0) {
-        gst_tag_setter_add_tags (tagger,
-                            GST_TAG_MERGE_APPEND,
-                            GST_TAG_MUSICBRAINZ_SORTNAME, track->artist_sortname,
-                            NULL);
-      }
-#endif
 
       if (track->album->genre != NULL && strcmp (track->album->genre, "") != 0) {
         gst_tag_setter_add_tags (tagger,