changeset 1315:c7b3996a123f trunk

[svn] - chase encoding patch removal

--- a/ChangeLog	Mon Jun 19 14:41:51 2006 -0700
+++ b/ChangeLog	Mon Jun 19 23:00:03 2006 -0700
@@ -1,3 +1,13 @@
[phone]:41:51 +0000  Derek Pomery <[e-mail]>
+  revision [1540]
+  
+  Dammit. Test before checking in.
+  
+
+  Changes:        Modified:
+  +2 -2           trunk/audacious/ui_fileinfo.c  
+
+
 2006-06-19 21:33:54 +0000  Derek Pomery <[e-mail]>
   revision [1538]
   Better, nenolod? :-p

--- a/Plugins/Input/mpg123/configure.c	Mon Jun 19 14:41:51 2006 -0700
+++ b/Plugins/Input/mpg123/configure.c	Mon Jun 19 23:00:03 2006 -0700
@@ -30,10 +30,6 @@
 static GtkWidget *streaming_save_hbox, *title_id3_box, *title_tag_desc;
 static GtkWidget *title_override, *title_id3_entry, *title_id3v2_disable;
 
-/* Encoding patch */
-static GtkWidget *title_encoding_hbox, *title_encoding_enabled, *title_encoding, *title_encoding_label;
-/* Encoding patch */
-
 MPG123Config mpgdec_cfg;
 
 static void
@@ -81,10 +77,6 @@
     mpgdec_cfg.id3_format =
         g_strdup(gtk_entry_get_text(GTK_ENTRY(title_id3_entry)));
 
-    mpgdec_cfg.title_encoding_enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(title_encoding_enabled));
-    mpgdec_cfg.title_encoding = g_strdup(gtk_entry_get_text(GTK_ENTRY(title_encoding)));
-    if (mpgdec_cfg.title_encoding_enabled)
-        mpgdec_id3_encoding_list = g_strsplit_set(mpgdec_cfg.title_encoding, ENCODING_SEPARATOR, 0);
     db = bmp_cfg_db_open();
     bmp_cfg_db_set_int(db, "MPG123", "resolution", mpgdec_cfg.resolution);
     bmp_cfg_db_set_int(db, "MPG123", "channels", mpgdec_cfg.channels);
@@ -105,11 +97,6 @@
                         mpgdec_cfg.disable_id3v2);
     bmp_cfg_db_set_string(db, "MPG123", "id3_format", mpgdec_cfg.id3_format);
 
-/* Encoding patch */
-    bmp_cfg_db_set_bool(db, "MPG123", "title_encoding_enabled", mpgdec_cfg.title_encoding_enabled);
-    bmp_cfg_db_set_string(db, "MPG123", "title_encoding", mpgdec_cfg.title_encoding);
-/* Encoding patch */
-
     bmp_cfg_db_close(db);
     gtk_widget_destroy(mpgdec_configurewin);
 }
@@ -160,17 +147,6 @@
     gtk_widget_set_sensitive(title_tag_desc, override);
 }
 
-/* Encoding patch */
-static void
-title_encoding_enabled_cb(GtkWidget * w, gpointer data)
-{
-    gboolean encoding_enabled;
-    encoding_enabled =
-        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(title_encoding_enabled));
-    gtk_widget_set_sensitive(title_encoding_hbox, encoding_enabled);
-}
-/* Encoding patch */
-
 static void
 configure_destroy(GtkWidget * w, gpointer data)
 {
@@ -434,33 +410,6 @@
     gtk_box_pack_start(GTK_BOX(title_id3_vbox), title_id3v2_disable, FALSE,
                        FALSE, 0);
 
-
-/* Encoding patch */
-    title_encoding_enabled =
-        gtk_check_button_new_with_label(_("Convert non-UTF8 ID3 tags to UTF8"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(title_encoding_enabled),
-                                 mpgdec_cfg.title_encoding_enabled);
-    g_signal_connect(G_OBJECT(title_encoding_enabled), "clicked",
-                     G_CALLBACK(title_encoding_enabled_cb), NULL);
-    gtk_box_pack_start(GTK_BOX(title_id3_vbox), title_encoding_enabled, FALSE,
-                       FALSE, 0);
-
-    title_encoding_hbox = gtk_hbox_new(FALSE, 5);
-    gtk_widget_set_sensitive(title_encoding_hbox, mpgdec_cfg.title_encoding_enabled);
-    gtk_box_pack_start(GTK_BOX(title_id3_vbox), title_encoding_hbox, FALSE,
-                       FALSE, 0);
-
-    title_encoding_label = gtk_label_new(_("ID3 encoding:"));
-    gtk_box_pack_start(GTK_BOX(title_encoding_hbox), title_encoding_label, FALSE,
-                       FALSE, 0);
-
-    title_encoding = gtk_entry_new();
-    gtk_entry_set_text(GTK_ENTRY(title_encoding), mpgdec_cfg.title_encoding);
-    gtk_box_pack_start(GTK_BOX(title_encoding_hbox), title_encoding, TRUE, TRUE,
-                       0);
-/* Encoding patch */
-
-
     title_override =
         gtk_check_button_new_with_label(_("Override generic titles"));
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(title_override),