[tracker/tracker-0.10] tracker-extract: Don't skip the last metadata iterator element in flac files.



commit 6c7d4553b33ec5c1b506a681cc812561830686bb
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Apr 27 17:29:57 2011 +0200

    tracker-extract: Don't skip the last metadata iterator element in flac files.
    
    Fixes GB#633108 - FLAC extractor doesn't work properly, reported by
    Aleksander Morgado.

 src/tracker-extract/tracker-extract-flac.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-flac.c b/src/tracker-extract/tracker-extract-flac.c
index ceb0238..a4a69c9 100644
--- a/src/tracker-extract/tracker-extract-flac.c
+++ b/src/tracker-extract/tracker-extract-flac.c
@@ -190,7 +190,7 @@ extract_flac (const gchar          *uri,
 		return;
 	}
 
-	while (!FLAC__metadata_simple_iterator_is_last (iter)) {
+	do {
 		switch (FLAC__metadata_simple_iterator_get_block_type (iter)) {
 		case FLAC__METADATA_TYPE_STREAMINFO:
 			stream = FLAC__metadata_simple_iterator_get_block (iter);
@@ -211,9 +211,7 @@ extract_flac (const gchar          *uri,
 		default:
 			break;
 		}
-
-		FLAC__metadata_simple_iterator_next (iter);
-	}
+	} while (FLAC__metadata_simple_iterator_next (iter));
 
 	creator = tracker_coalesce_strip (3, fd.artist, fd.albumartist,
 	                                  fd.performer);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]