[tracker] Revert "tracker-extract-mp3: Do not always use guessed encoding for ID3v2"



commit aaafbca01620709ba7b488f2b15f80ba97bbc512
Author: Carlos Garnacho <carlos lanedo com>
Date:   Tue Oct 1 12:13:32 2013 +0200

    Revert "tracker-extract-mp3: Do not always use guessed encoding for ID3v2"
    
    The new ICU based encoding detector should be more reliable, plus this hack
    is triggered consistently on a very wide set of locale environments, also
    happening for legit files that do need the encoding. The bug and file that
    motivated this patch are also long lost and forgotten... so this patch will
    remain in git history.
    
    This reverts commit 9b2acf60b54fe9332a48f5260350c050e65c4111.

 src/tracker-extract/tracker-extract-mp3.c |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index d5aea57..99039dc 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -2138,21 +2138,6 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
 
        g_free (id3v1_buffer);
 
-       if (md.id3v1.encoding != NULL) {
-               gchar *locale;
-
-               locale = tracker_locale_get (TRACKER_LOCALE_LANGUAGE);
-               if (!g_str_has_prefix (locale, "ru") &&
-                   !g_str_has_prefix (locale, "uk")) {
-                       /* use guessed encoding for ID3v2 tags only in selected locales
-                          where broken ID3v2 is widespread */
-                       g_free (md.id3v1.encoding);
-                       md.id3v1.encoding = NULL;
-               }
-               g_free (locale);
-               locale = NULL;
-       }
-
        /* Get other embedded tags */
        uri = g_file_get_uri (file);
        audio_offset = parse_id3v2 (buffer, buffer_size, &md.id3v1, uri, metadata, &md);


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