# HG changeset patch
# User yaz
# Date 1171771141 28800
# Node ID 610d85b8a22b4c45a0cf320d11fdb5a927111a1e
# Parent  f6c2e4388d28310ea84f0dcfbcfc45e7b246dd43
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.

diff -r f6c2e4388d28 -r 610d85b8a22b ChangeLog
--- a/ChangeLog	Sat Feb 17 16:59:39 2007 -0800
+++ b/ChangeLog	Sat Feb 17 19:59:01 2007 -0800
@@ -1,3 +1,12 @@
+2007-02-18 00:59:39 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4098]
+  - update chinese simplified translation -- 
+    see http://boards.nenolod.net/viewtopic.php?t=307
+  
+  trunk/po/zh_CN.po |  621 ++++++++++++++++++++----------------------------------
+  1 file changed, 238 insertions(+), 383 deletions(-)
+
+
 2007-02-17 13:54:16 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [4096]
   - make configure script show the configuration status of sampling rate conversion.
diff -r f6c2e4388d28 -r 610d85b8a22b src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Sat Feb 17 16:59:39 2007 -0800
+++ b/src/audacious/build_stamp.c	Sat Feb 17 19:59:01 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070217-4096";
+const gchar *svn_stamp = "20070218-4098";
diff -r f6c2e4388d28 -r 610d85b8a22b src/audacious/playlist.c
--- a/src/audacious/playlist.c	Sat Feb 17 16:59:39 2007 -0800
+++ b/src/audacious/playlist.c	Sat Feb 17 19:59:01 2007 -0800
@@ -588,11 +588,11 @@
 
 static void
 __playlist_ins_with_info(Playlist * playlist,
-			 const gchar * filename,
+                         const gchar * filename,
                          gint pos,
                          const gchar * title,
                          gint len,
-			 InputPlugin * dec)
+                         InputPlugin * dec)
 {
     g_return_if_fail(filename != NULL);
 
@@ -639,11 +639,12 @@
     }
 
     PLAYLIST_UNLOCK(playlist->mutex);
-
-    g_mutex_lock(mutex_scan);
-    playlist_get_info_scan_active = TRUE;
-    g_mutex_unlock(mutex_scan);
-    g_cond_signal(cond_scan);
+    if(tuple->mtime == -1) { // kick the scanner thread only if mtime = -1 (uninitialized).
+        g_mutex_lock(mutex_scan);
+        playlist_get_info_scan_active = TRUE;
+        g_mutex_unlock(mutex_scan);
+        g_cond_signal(cond_scan);
+    }
 }
 
 static void
@@ -679,9 +680,9 @@
 
     if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || (playlist->loading_playlist == FALSE && dec != NULL))
     {
-	__playlist_ins(playlist, filename, pos, dec);
-	playlist_generate_shuffle_list(playlist);
-	playlistwin_update_list(playlist);
+        __playlist_ins(playlist, filename, pos, dec);
+        playlist_generate_shuffle_list(playlist);
+        playlistwin_update_list(playlist);
         return TRUE;
     }
 
@@ -2468,7 +2469,7 @@
                         update_playlistwin = TRUE;
                         if (entry == playlist->position)
                             update_mainwin = TRUE;
-			// no need for break here since this iteration is very short.
+                        // no need for break here since this iteration is very short.
                     }
                 }
                 PLAYLIST_UNLOCK(playlist->mutex);