# HG changeset patch
# User mf0102 <0102@gmx.at>
# Date 1208359336 -7200
# Node ID 42559dad8f8f3f6027bc8c0a01ddb64460d8fe7b
# Parent  7489ef3ea7bd20e201740d99b7211c9dd5dadc6e
- remove some now-unneeded configuration properties
- slightly reorder the instructions in mainwin_update_song_info()

diff -r 7489ef3ea7bd -r 42559dad8f8f src/audacious/audconfig.h
--- a/src/audacious/audconfig.h	Wed Apr 16 10:35:05 2008 +0300
+++ b/src/audacious/audconfig.h	Wed Apr 16 17:22:16 2008 +0200
@@ -51,9 +51,7 @@
     gboolean no_playlist_advance;
     gboolean stopaftersong;
     gboolean refresh_file_list;
-    gboolean smooth_title_scroll;
     gboolean use_pl_metadata;
-    gboolean warn_about_unplayables;
     gboolean warn_about_win_visibility;
     gboolean use_backslash_as_dir_delimiter;
     gboolean random_skin_on_play;
@@ -90,7 +88,6 @@
     gint titlestring_preset;
     gchar *gentitle_format;
     gboolean softvolume_enable;
-    gboolean xmms_compat_mode;
     gboolean eq_extra_filtering;
     gint scroll_pl_by;
     gboolean resume_playback_on_startup;
@@ -111,7 +108,6 @@
     gboolean use_xmms_style_fileselector;
     gboolean use_extension_probing;
     gint colorize_r; gint colorize_g; gint colorize_b;
-    gboolean terminate;
     gboolean filepopup_showprogressbar;
     gboolean close_jtf_dialog;
     gboolean twoway_scroll;
diff -r 7489ef3ea7bd -r 42559dad8f8f src/audacious/ui_main.c
--- a/src/audacious/ui_main.c	Wed Apr 16 10:35:05 2008 +0300
+++ b/src/audacious/ui_main.c	Wed Apr 16 17:22:16 2008 +0200
@@ -2498,17 +2498,17 @@
 gboolean
 mainwin_update_song_info(void)
 {
-    gint time = playback_get_time();
-    gint length, t;
-    gchar stime_prefix;
-
     if (!playback_get_playing())
         return FALSE;
 
+    gint time = playback_get_time();
+    gint length = playback_get_length();
+    gint t;
+    gchar stime_prefix;
+
     if (ab_position_a != -1 && ab_position_b != -1 && time > ab_position_b)
         playback_seek(ab_position_a/1000);
 
-    length = playback_get_length();
     if (length == -1 && cfg.timer_mode == TIMER_REMAINING)
         cfg.timer_mode = TIMER_ELAPSED;