[rhythmbox] update musicbrainz/sortname tags, require gst 0.10.15

[Jonathan Matthew <jmatthew src gnome org>]

commit 107657d49fd9125bec235091ad470cf25a1e37d5
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue May 5 19:06:18 2009 +1000

    update musicbrainz/sortname tags, require gst 0.10.15
---
 backends/gstreamer/rb-encoder-gst.c       |    4 +---
 backends/gstreamer/rb-player-gst-helper.c |    3 +--
 configure.ac                              |    2 +-
 metadata/rb-metadata-gst.c                |    9 ++-------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/backends/gstreamer/rb-encoder-gst.c b/backends/gstreamer/rb-encoder-gst.c
index 97127d6..c372712 100644
--- a/backends/gstreamer/rb-encoder-gst.c
+++ b/backends/gstreamer/rb-encoder-gst.c
@@ -428,7 +428,6 @@ add_tags_from_entry (RBEncoderGst *encoder,
 				  NULL);
 		g_date_free (date);
 	}
-#ifdef GST_TAG_MUSICBRAINZ_TRACKID
 	if (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_MUSICBRAINZ_TRACKID)) {
 		gst_tag_list_add (tags, GST_TAG_MERGE_APPEND,
 				  GST_TAG_MUSICBRAINZ_TRACKID, rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_MUSICBRAINZ_TRACKID),
@@ -451,7 +450,7 @@ add_tags_from_entry (RBEncoderGst *encoder,
 	}
 	if (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ARTIST_SORTNAME)) {
 		gst_tag_list_add (tags, GST_TAG_MERGE_APPEND,
-				  GST_TAG_MUSICBRAINZ_SORTNAME, rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ARTIST_SORTNAME),
+				  GST_TAG_ARTIST_SORTNAME, rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ARTIST_SORTNAME),
 				  NULL);
 	}
 	if (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ALBUM_SORTNAME)) {
@@ -459,7 +458,6 @@ add_tags_from_entry (RBEncoderGst *encoder,
 				  GST_TAG_ALBUM_SORTNAME, rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ALBUM_SORTNAME),
 				  NULL);
 	}
-#endif
 
 	{
 		GstIterator *iter;
diff --git a/backends/gstreamer/rb-player-gst-helper.c b/backends/gstreamer/rb-player-gst-helper.c
index abdd0ea..845a421 100644
--- a/backends/gstreamer/rb-player-gst-helper.c
+++ b/backends/gstreamer/rb-player-gst-helper.c
@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include <gst/gst.h>
+#include <gst/tag/tag.h>
 
 #include <rb-player-gst-helper.h>
 #include <rb-debug.h>
@@ -223,10 +224,8 @@ rb_gst_process_tag_string (const GstTagList *taglist,
 		*field = RB_METADATA_FIELD_COMMENT;
 	else if (!strcmp (tag, GST_TAG_BITRATE))
 		*field = RB_METADATA_FIELD_BITRATE;
-#ifdef GST_TAG_MUSICBRAINZ_TRACKID
 	else if (!strcmp (tag, GST_TAG_MUSICBRAINZ_TRACKID))
 		*field = RB_METADATA_FIELD_MUSICBRAINZ_TRACKID;
-#endif
 	else {
 		rb_debug ("tag %s doesn't correspond to a metadata field we're interested in", tag);
 		return FALSE;
diff --git a/configure.ac b/configure.ac
index 2ef5e3f..6ba5007 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(long)
 
 DBUS_MIN_REQS=0.35
-GST_0_10_REQS=0.10.14
+GST_0_10_REQS=0.10.15
 GTK_REQS=2.12.0
 GLIB_REQS=2.16.0
 GNOME_MEDIA_PROFILES_REQS=2.8
diff --git a/metadata/rb-metadata-gst.c b/metadata/rb-metadata-gst.c
index 751b04a..c11b45f 100644
--- a/metadata/rb-metadata-gst.c
+++ b/metadata/rb-metadata-gst.c
@@ -514,7 +514,6 @@ rb_metadata_gst_tag_to_field (const char *tag)
 		return RB_METADATA_FIELD_ALBUM_GAIN;
 	else if (!strcmp (tag, GST_TAG_ALBUM_PEAK))
 		return RB_METADATA_FIELD_ALBUM_PEAK;
-#ifdef GST_TAG_MUSICBRAINZ_TRACKID
 	else if (!strcmp (tag, GST_TAG_MUSICBRAINZ_TRACKID))
 		return RB_METADATA_FIELD_MUSICBRAINZ_TRACKID;
 	else if (!strcmp (tag, GST_TAG_MUSICBRAINZ_ARTISTID))
@@ -523,12 +522,10 @@ rb_metadata_gst_tag_to_field (const char *tag)
 		return RB_METADATA_FIELD_MUSICBRAINZ_ALBUMID;
 	else if (!strcmp (tag, GST_TAG_MUSICBRAINZ_ALBUMARTISTID))
 		return RB_METADATA_FIELD_MUSICBRAINZ_ALBUMARTISTID;
-	else if (!strcmp (tag, GST_TAG_MUSICBRAINZ_SORTNAME))
+	else if (!strcmp (tag, GST_TAG_ARTIST_SORTNAME))
 		return RB_METADATA_FIELD_ARTIST_SORTNAME;
 	else if (!strcmp (tag, GST_TAG_ALBUM_SORTNAME))
 		return RB_METADATA_FIELD_ALBUM_SORTNAME;
-
-#endif
 	else
 		return -1;
 }
@@ -588,7 +585,6 @@ rb_metadata_gst_field_to_gst_tag (RBMetaDataField field)
 		return GST_TAG_ALBUM_GAIN;
 	case RB_METADATA_FIELD_ALBUM_PEAK:
 		return GST_TAG_ALBUM_PEAK;
-#ifdef GST_TAG_MUSICBRAINZ_TRACKID
 	case RB_METADATA_FIELD_MUSICBRAINZ_TRACKID:
 		return GST_TAG_MUSICBRAINZ_TRACKID;
 	case RB_METADATA_FIELD_MUSICBRAINZ_ARTISTID:
@@ -598,10 +594,9 @@ rb_metadata_gst_field_to_gst_tag (RBMetaDataField field)
 	case RB_METADATA_FIELD_MUSICBRAINZ_ALBUMARTISTID:
 		return GST_TAG_MUSICBRAINZ_ALBUMARTISTID;
 	case RB_METADATA_FIELD_ARTIST_SORTNAME:
-		return GST_TAG_MUSICBRAINZ_SORTNAME;
+		return GST_TAG_ARTIST_SORTNAME;
 	case RB_METADATA_FIELD_ALBUM_SORTNAME:
 		return GST_TAG_ALBUM_SORTNAME;
-#endif
 	default:
 		return NULL;
 	}