# HG changeset patch
# User yaz
# Date 1170924906 28800
# Node ID ca4cd00ca0c858a116957f1edae67df415ef7f4b
# Parent  a7a28782c1b0e62371757ad065a332219ca810e6
[svn] - now title_override works.

diff -r a7a28782c1b0 -r ca4cd00ca0c8 ChangeLog
--- a/ChangeLog	Wed Feb 07 23:31:26 2007 -0800
+++ b/ChangeLog	Thu Feb 08 00:55:06 2007 -0800
@@ -1,3 +1,15 @@
+2007-02-08 07:31:26 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [1322]
+  - revise input_id3_get_string() to take encoding of field into account.
+  - restore title_override options I accidentally dropped.
+  - remove unnecessary code.
+  
+  trunk/src/madplug/configure.c |  110 ------------------------------------------
+  trunk/src/madplug/input.c     |   60 +++++++++++-----------
+  trunk/src/madplug/plugin.c    |    4 +
+  3 files changed, 33 insertions(+), 141 deletions(-)
+
+
 2007-02-08 02:26:47 +0000  Giacomo Lozito <james@develia.org>
   revision [1320]
   - aosd: added window class hints (aosd.Audacious)
diff -r a7a28782c1b0 -r ca4cd00ca0c8 src/madplug/configure.c
--- a/src/madplug/configure.c	Wed Feb 07 23:31:26 2007 -0800
+++ b/src/madplug/configure.c	Thu Feb 08 00:55:06 2007 -0800
@@ -62,6 +62,12 @@
     text = gtk_entry_get_text(GTK_ENTRY(pregain));
     audmad_config.pregain_db = g_strdup(text);
 
+    audmad_config.title_override =
+        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(title_override));
+
+    text = gtk_entry_get_text(GTK_ENTRY(title_id3_entry));
+    audmad_config.id3_format = g_strdup(text);
+
     audmad_config_compute(&audmad_config);
 
     db = bmp_cfg_db_open();
diff -r a7a28782c1b0 -r ca4cd00ca0c8 src/madplug/decoder.c
--- a/src/madplug/decoder.c	Wed Feb 07 23:31:26 2007 -0800
+++ b/src/madplug/decoder.c	Thu Feb 08 00:55:06 2007 -0800
@@ -385,9 +385,8 @@
     /* set mainwin title */
     if (info->title)
         g_free(info->title);
-    info->title =
-        xmms_get_titlestring(xmms_get_gentitle_format(), info->tuple);
-
+    info->title = xmms_get_titlestring(audmad_config.title_override == TRUE ?
+        audmad_config.id3_format : xmms_get_gentitle_format(), info->tuple);
     
     tlen = (gint) mad_timer_count(info->duration, MAD_UNITS_MILLISECONDS),
     
diff -r a7a28782c1b0 -r ca4cd00ca0c8 src/madplug/plugin.c
--- a/src/madplug/plugin.c	Wed Feb 07 23:31:26 2007 -0800
+++ b/src/madplug/plugin.c	Thu Feb 08 00:55:06 2007 -0800
@@ -599,6 +599,7 @@
     }
 
     tuple = audmad_get_song_tuple(info->filename);
+    
     info->title = xmms_get_titlestring(audmad_config.title_override == TRUE ?
 	audmad_config.id3_format : xmms_get_gentitle_format(), tuple);