[tracker/gst-geolocation] tracker-extract-gstreamer, gupnp-dlna: Extract geolocation for all content types

[Martyn James Russell <mr src gnome org>]

commit a376fc217270336e1b33507686c66c78cc12df0c
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Aug 16 15:59:59 2011 +0100

    tracker-extract-gstreamer, gupnp-dlna: Extract geolocation for all content types

 src/tracker-extract/tracker-extract-gstreamer.c  |    5 +++--
 src/tracker-extract/tracker-extract-gupnp-dlna.c |    8 +++-----
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index f509f9a..2c0cca0 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -599,11 +599,9 @@ extract_metadata (MetadataExtractor      *extractor,
 				g_free (composer);
 			}
 
-			add_geolocation_tags (metadata, preupdate, extractor->tagcache);
 		}
 
 		/* Audio */
-
 		if (extractor->mime == EXTRACT_MIME_AUDIO) {
 			gst_tag_list_get_string (extractor->tagcache, GST_TAG_ALBUM, &albumname);
 		}
@@ -839,6 +837,9 @@ extract_metadata (MetadataExtractor      *extractor,
 		g_free (artist_uri);
 
 		add_string_gst_tag (metadata, uri, "nfo:codec", extractor->tagcache, GST_TAG_AUDIO_CODEC);
+
+		/* Add geo location information regardless of mime type */
+		add_geolocation_tags (metadata, preupdate, extractor->tagcache);
 	} else if (extractor->mime == EXTRACT_MIME_GUESS) {
 		g_warning ("Cannot guess real stream type if no tags were read! "
 		           "Defaulting to Video.");
diff --git a/src/tracker-extract/tracker-extract-gupnp-dlna.c b/src/tracker-extract/tracker-extract-gupnp-dlna.c
index 8d03c4d..6f11a55 100644
--- a/src/tracker-extract/tracker-extract-gupnp-dlna.c
+++ b/src/tracker-extract/tracker-extract-gupnp-dlna.c
@@ -704,6 +704,9 @@ extract_metadata (MetadataExtractor      *extractor,
 		g_free (album_uri);
 
 		add_string_gst_tag (metadata, uri, "nfo:codec", extractor->tags, GST_TAG_AUDIO_CODEC);
+
+		/* Add geo location information regardless of content type */
+		add_geolocation_tags (metadata, preupdate, extractor->tags);
 	} else {
 		if (extractor->content == CONTENT_AUDIO)
 			needs_audio = TRUE;
@@ -762,11 +765,6 @@ extract_metadata (MetadataExtractor      *extractor,
 
 	}
 
-	if (extractor->content == CONTENT_IMAGE ||
-	    extractor->content == CONTENT_VIDEO) {
-		add_geolocation_tags (metadata, preupdate, extractor->tags);
-	}
-
 	if (extractor->dlna_profile) {
 		tracker_sparql_builder_predicate (metadata, "nmm:dlnaProfile");
 		tracker_sparql_builder_object_string (metadata, extractor->dlna_profile);