[easytag] Stop supporting to write ID3 tags into FLAC files

[David King <davidk src gnome org>]

commit aad2aebd458e4ce649c7eb831c9e8bb5fd93b819
Author: Adrian Bunk <bunk stusta de>
Date:   Mon May 20 17:25:44 2013 +0300

    Stop supporting to write ID3 tags into FLAC files
    
    This is not (anymore?) supported at all by libflac, with e.g.  oggenc
    erroring out with:
      ERROR: Input file "song.flac" is not a supported format
    
    Even as an option it does more harm than good due to people accidentally
    enabling it.
    
    FLAC pictures are supported since EasyTAG 2.1.4. Fixes bug 700724.

 src/flac_tag.c |   27 ---------------------------
 src/prefs.c    |   14 +++-----------
 src/prefs.h    |    1 -
 src/setting.c  |    3 ---
 src/setting.h  |    1 -
 5 files changed, 3 insertions(+), 43 deletions(-)
---
diff --git a/src/flac_tag.c b/src/flac_tag.c
index 0c067ff..1b4110b 100644
--- a/src/flac_tag.c
+++ b/src/flac_tag.c
@@ -733,26 +733,6 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
         g_free(filename_utf8);
         return rc;
     }
-
-    /* Part to get cover artist :
-     * If we have read the ID3 tag previously we don't arrive here (and we have
-     * the picture if it exists).
-     * Else the ID3 tag wasn't read (as there was data in FLAC tag) so we try
-     * to read it only to get the picture (not supported by the FLAC tag). */
-    /***if (WRITE_ID3_TAGS_IN_FLAC_FILE && FileTag->picture == NULL)
-    {
-        File_Tag *FileTag_tmp = ET_File_Tag_Item_New();
-        gint rc = Id3tag_Read_File_Tag(filename,FileTag_tmp);
-        if (rc && FileTag_tmp->picture)
-        {
-            // Copy picture to FileTag
-            FileTag->picture = Picture_Copy(FileTag_tmp->picture);
-        }
-
-        ET_Free_File_Tag_Item(FileTag_tmp);
-
-        return rc;
-    }***/
 #endif
 
     g_free(filename_utf8);
@@ -1103,13 +1083,6 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
 
     
 #ifdef ENABLE_MP3
-    /*
-     * Write also the ID3 tags (ID3v1 and/or ID3v2) if wanted (as needed by some players)
-     */
-    if (WRITE_ID3_TAGS_IN_FLAC_FILE)
-    {
-        Id3tag_Write_File_Tag(ETFile);
-    }else
     {
         // Delete the ID3 tags (create a dummy ETFile for the Id3tag_... function)
         ET_File   *ETFile_tmp    = ET_File_Item_New();
diff --git a/src/prefs.c b/src/prefs.c
index 4f28d81..c136589 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -652,17 +652,9 @@ void Open_OptionsWindow (void)
     gtk_grid_set_row_spacing (GTK_GRID (Table), BOX_SPACING);
     gtk_grid_set_column_spacing (GTK_GRID (Table), BOX_SPACING);
 
-    /* Write ID3 tags in FLAC files */
-    WriteId3TagsInFlacFiles = gtk_check_button_new_with_label(_("Write ID3 tags in FLAC files (in addition 
to FLAC tag)"));
-    gtk_grid_attach (GTK_GRID (Table), WriteId3TagsInFlacFiles, 0, 0, 1, 1);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(WriteId3TagsInFlacFiles),WRITE_ID3_TAGS_IN_FLAC_FILE);
-    gtk_widget_set_tooltip_text(WriteId3TagsInFlacFiles,_("If activated, ID3 tags will be "
-        "also added in the FLAC file (according the two rules above, plus the FLAC tag). "
-        "Else ID3 tags will be stripped."));
-
     /* Strip tag when fields (managed by EasyTAG) are empty */
     StripTagWhenEmptyFields = gtk_check_button_new_with_label(_("Strip tags if all fields are set to 
blank"));
-    gtk_grid_attach (GTK_GRID (Table), StripTagWhenEmptyFields, 0, 1, 1, 1);
+    gtk_grid_attach (GTK_GRID (Table), StripTagWhenEmptyFields, 0, 0, 1, 1);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(StripTagWhenEmptyFields),STRIP_TAG_WHEN_EMPTY_FIELDS);
     gtk_widget_set_tooltip_text(StripTagWhenEmptyFields,_("As ID3v2 tags may contain other data than "
         "Title, Artist, Album, Year, Track, Genre or Comment (as an attached image, lyrics…), "
@@ -671,7 +663,7 @@ void Open_OptionsWindow (void)
 
     /* Convert old ID3v2 tag version */
     ConvertOldId3v2TagVersion = gtk_check_button_new_with_label(_("Automatically convert old ID3v2 tag 
versions"));
-    gtk_grid_attach (GTK_GRID (Table), ConvertOldId3v2TagVersion, 0, 2, 1, 1);
+    gtk_grid_attach (GTK_GRID (Table), ConvertOldId3v2TagVersion, 0, 1, 1, 1);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ConvertOldId3v2TagVersion),CONVERT_OLD_ID3V2_TAG_VERSION);
     gtk_widget_set_tooltip_text(ConvertOldId3v2TagVersion,_("If activated, an old ID3v2 tag version (as "
         "ID3v2.2) will be updated to the ID3v2.3 version."));
@@ -691,7 +683,7 @@ void Open_OptionsWindow (void)
        
     /* Write Genre in text */
     FileWritingId3v2TextOnlyGenre = gtk_check_button_new_with_label(_("Write Genre in text only"));
-    gtk_grid_attach (GTK_GRID (Table), FileWritingId3v2TextOnlyGenre, 1, 2, 1,
+    gtk_grid_attach (GTK_GRID (Table), FileWritingId3v2TextOnlyGenre, 0, 2, 1,
                      1);
     
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FileWritingId3v2TextOnlyGenre),FILE_WRITING_ID3V2_TEXT_ONLY_GENRE);
     gtk_widget_set_tooltip_text(FileWritingId3v2TextOnlyGenre,_("Don't use ID3v1 number references in genre 
tag. Enable this if you see numbers as genre in your music player."));     
diff --git a/src/prefs.h b/src/prefs.h
index 36ad8d9..a389998 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -76,7 +76,6 @@ GtkWidget *FilenameCharacterSetDiscard;
 /* Tag Settings */
 GtkWidget *FileWritingId3v2WriteTag;
 GtkWidget *FileWritingId3v1WriteTag;
-GtkWidget *WriteId3TagsInFlacFiles;
 GtkWidget *FileWritingId3v2UseCrc32;
 GtkWidget *FileWritingId3v2UseCompression;
 GtkWidget *FileWritingId3v2TextOnlyGenre;
diff --git a/src/setting.c b/src/setting.c
index 7a071a9..dac046d 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -152,7 +152,6 @@ static const tConfigVariable Config_Variables[] =
     {"filename_character_set_approximate",             CV_TYPE_BOOL,    &FILENAME_CHARACTER_SET_APPROXIMATE  
     },
     {"filename_character_set_discard",                 CV_TYPE_BOOL,    &FILENAME_CHARACTER_SET_DISCARD      
     },
 
-    {"write_id3_tags_in_flac_file",                    CV_TYPE_BOOL,  &WRITE_ID3_TAGS_IN_FLAC_FILE           
          },
     {"strip_tag_when_empty_fields",                    CV_TYPE_BOOL,  &STRIP_TAG_WHEN_EMPTY_FIELDS           
          },
     {"convert_old_id3v2_tag_version",                  CV_TYPE_BOOL,  &CONVERT_OLD_ID3V2_TAG_VERSION         
          },
     {"use_non_standard_id3_reading_character_set",     CV_TYPE_BOOL,  
&USE_NON_STANDARD_ID3_READING_CHARACTER_SET},
@@ -413,7 +412,6 @@ void Init_Config_Variables (void)
     /*
      * Tag Settings
      */
-    WRITE_ID3_TAGS_IN_FLAC_FILE                     = 0;
     STRIP_TAG_WHEN_EMPTY_FIELDS                     = 1;
     CONVERT_OLD_ID3V2_TAG_VERSION                   = 1;
     USE_NON_STANDARD_ID3_READING_CHARACTER_SET      = 0;
@@ -706,7 +704,6 @@ Apply_Changes_Of_Preferences_Window (void)
         FILENAME_CHARACTER_SET_DISCARD            = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(FilenameCharacterSetDiscard));
 
         /* Tag Settings */
-        WRITE_ID3_TAGS_IN_FLAC_FILE                = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(WriteId3TagsInFlacFiles));
         STRIP_TAG_WHEN_EMPTY_FIELDS                = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(StripTagWhenEmptyFields));
         CONVERT_OLD_ID3V2_TAG_VERSION              = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ConvertOldId3v2TagVersion));
         USE_NON_STANDARD_ID3_READING_CHARACTER_SET = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(UseNonStandardId3ReadingCharacterSet));
diff --git a/src/setting.h b/src/setting.h
index 53f92cd..c8b85a4 100644
--- a/src/setting.h
+++ b/src/setting.h
@@ -91,7 +91,6 @@ gint    FILENAME_CHARACTER_SET_APPROXIMATE;
 gint    FILENAME_CHARACTER_SET_DISCARD;
 
 /* Tag Settings */
-gint    WRITE_ID3_TAGS_IN_FLAC_FILE;
 gint    STRIP_TAG_WHEN_EMPTY_FIELDS;
 gint    CONVERT_OLD_ID3V2_TAG_VERSION;