[easytag] Remove XMMS Vorbis comment compatibility



commit f2589aa6edc4925d1404f8c97f05b2e3d52ca7a0
Author: David King <amigadave amigadave com>
Date:   Sun Mar 24 23:00:53 2013 +0000

    Remove XMMS Vorbis comment compatibility
    
    The empty comment name that XMMS used is old and non-standard.

 src/ogg_tag.c |    7 -------
 src/prefs.c   |    8 --------
 src/prefs.h   |    1 -
 src/setting.c |    3 ---
 src/setting.h |    1 -
 5 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/src/ogg_tag.c b/src/ogg_tag.c
index 0a47529..1f8b959 100644
--- a/src/ogg_tag.c
+++ b/src/ogg_tag.c
@@ -747,13 +747,6 @@ gboolean Ogg_Tag_Write_File_Tag (ET_File *ETFile)
     /* Format of new specification. */
     Ogg_Set_Tag(vc,"DESCRIPTION=",FileTag->comment,VORBIS_SPLIT_FIELD_COMMENT);
 
-    if (OGG_TAG_WRITE_XMMS_COMMENT)
-    {
-        /* Format used with xmms-1.2.5. */
-        Ogg_Set_Tag(vc,"=",FileTag->comment,VORBIS_SPLIT_FIELD_COMMENT);
-    }
-
-
     /************
      * Composer *
      ************/
diff --git a/src/prefs.c b/src/prefs.c
index ce38ed4..f34ed8c 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -569,14 +569,6 @@ void Open_OptionsWindow (void)
     
g_signal_connect_swapped(G_OBJECT(NumberTrackFormatedSpinButton),"changed",G_CALLBACK(Number_Track_Formatted_Spin_Button_Changed),G_OBJECT(Label));
     g_signal_emit_by_name(G_OBJECT(NumberTrackFormatedSpinButton),"changed",NULL);
 
-    OggTagWriteXmmsComment = gtk_check_button_new_with_label(_("Ogg Vorbis Files: write also the comment in 
the XMMS format"));
-    gtk_box_pack_start(GTK_BOX(vbox),OggTagWriteXmmsComment,FALSE,FALSE,0);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(OggTagWriteXmmsComment),OGG_TAG_WRITE_XMMS_COMMENT);
-    gtk_widget_set_tooltip_text(OggTagWriteXmmsComment,_("XMMS doesn't make use of the right way to "
-        "identify a comment in Ogg Vorbis files as other apps do. In fact, this field is usually labeled "
-        "with 'comment=', whereas XMMS uses only `='. Please, uncheck this option if you don't want "
-        "other apps to complain about an unknown field. Comments won't be shown in XMMS, though."));
-
     // Separator line
     Separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
     gtk_box_pack_start(GTK_BOX(vbox),Separator,FALSE,FALSE,0);
diff --git a/src/prefs.h b/src/prefs.h
index 4bf321d..dc1805e 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -108,7 +108,6 @@ GtkWidget *LabelId3v2Version;
 GtkWidget *DateAutoCompletion;
 GtkWidget *NumberTrackFormated;
 GtkWidget *NumberTrackFormatedSpinButton;
-GtkWidget *OggTagWriteXmmsComment;
 GtkWidget *SetFocusToSameTagField;
 GtkWidget *SetFocusToFirstTagField;
 GtkWidget *LogMaxLinesSpinButton;
diff --git a/src/setting.c b/src/setting.c
index 2a665a2..dee65f3 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -133,7 +133,6 @@ tConfigVariable Config_Variables[] =
     {"date_auto_completion",                 CV_TYPE_BOOL,    &DATE_AUTO_COMPLETION                     },
     {"number_track_formated",                CV_TYPE_BOOL,    &NUMBER_TRACK_FORMATED                    },
     {"number_track_formated_spin_button",    CV_TYPE_INT,     &NUMBER_TRACK_FORMATED_SPIN_BUTTON        },
-    {"ogg_tag_write_xmms_comment",           CV_TYPE_BOOL,    &OGG_TAG_WRITE_XMMS_COMMENT               },
     {"set_focus_to_same_tag_field",          CV_TYPE_BOOL,    &SET_FOCUS_TO_SAME_TAG_FIELD              },
     {"set_focus_to_first_tag_field",         CV_TYPE_BOOL,    &SET_FOCUS_TO_FIRST_TAG_FIELD             },
     {"sorting_file_mode",                    CV_TYPE_INT,     &SORTING_FILE_MODE                        },
@@ -383,7 +382,6 @@ void Init_Config_Variables (void)
     DATE_AUTO_COMPLETION                    = 1;
     NUMBER_TRACK_FORMATED                   = 1;
     NUMBER_TRACK_FORMATED_SPIN_BUTTON       = 2;
-    OGG_TAG_WRITE_XMMS_COMMENT              = 1;
     SET_FOCUS_TO_SAME_TAG_FIELD             = 1;
     SET_FOCUS_TO_FIRST_TAG_FIELD            = 0;
     SORTING_FILE_MODE                       = SORTING_BY_ASCENDING_FILENAME;
@@ -676,7 +674,6 @@ Apply_Changes_Of_Preferences_Window (void)
         DATE_AUTO_COMPLETION                   = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(DateAutoCompletion));
         NUMBER_TRACK_FORMATED                  = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(NumberTrackFormated));
         NUMBER_TRACK_FORMATED_SPIN_BUTTON      = 
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(NumberTrackFormatedSpinButton));
-        OGG_TAG_WRITE_XMMS_COMMENT             = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(OggTagWriteXmmsComment));
         SORTING_FILE_CASE_SENSITIVE            = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SortingFileCaseSensitive));
         SET_FOCUS_TO_SAME_TAG_FIELD            = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SetFocusToSameTagField));
         SET_FOCUS_TO_FIRST_TAG_FIELD           = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField));
diff --git a/src/setting.h b/src/setting.h
index 6a06f1a..e3ea138 100644
--- a/src/setting.h
+++ b/src/setting.h
@@ -127,7 +127,6 @@ gint    VORBIS_SPLIT_FIELD_ORIG_ARTIST;
 gint    DATE_AUTO_COMPLETION;
 gint    NUMBER_TRACK_FORMATED;
 gint    NUMBER_TRACK_FORMATED_SPIN_BUTTON;
-gint    OGG_TAG_WRITE_XMMS_COMMENT;
 gint    SET_FOCUS_TO_SAME_TAG_FIELD;
 gint    SET_FOCUS_TO_FIRST_TAG_FIELD;
 gint    LOG_MAX_LINES;


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