changeset 1706:15e53bf1b389 trunk

[svn] - omit get_mtime from playlist_get_info_func().
author yaz
date Fri, 15 Sep 2006 18:51:16 -0700
parents ffa7b9168190
children 148b05d28ac2
files ChangeLog audacious/playlist.c
diffstat 2 files changed, 17 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Sep 15 18:26:57 2006 -0700
+++ b/ChangeLog	Fri Sep 15 18:51:16 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-16 01:26:57 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2347]
+  - do not build OSS plugin unless we really can
+  
+
+  Changes:        Modified:
+  +21 -20         trunk/configure.ac  
+
+
 2006-09-16 01:24:27 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2345]
   - remove debugging printf()'s
--- a/audacious/playlist.c	Fri Sep 15 18:26:57 2006 -0700
+++ b/audacious/playlist.c	Fri Sep 15 18:51:16 2006 -0700
@@ -1804,8 +1804,7 @@
 static time_t
 playlist_get_mtime(const gchar *filename)
 {
-	struct stat buf;
-
+    struct stat buf;
     gint rv;
 
     rv = stat(filename, &buf);
@@ -2175,12 +2174,8 @@
             for (node = playlist_get(); node; node = g_list_next(node)) {
                 entry = node->data;
 
-                if(entry->tuple) {
-//                    printf("tuple mtime = %ld file mtime = %ld\n", entry->tuple->mtime, playlist_get_mtime(entry->filename));
-                    if(entry->tuple->mtime == playlist_get_mtime(entry->filename)) 
+                if(entry->tuple && entry->tuple->mtime != 0) {
                         continue;
-                    else
-                        entry->tuple->mtime = 0; /* invalidate mtime */
                 }
 
                 if (!playlist_entry_get_info(entry)) {
@@ -2217,17 +2212,15 @@
                 continue;
             }
 
-            for (node =
-                 g_list_nth(playlist_get(), playlistwin_get_toprow());
-                 node
-                 &&
-                 playlistwin_item_visible(g_list_position
-                                          (playlist_get(), node));
+            for (node = g_list_nth(playlist_get(), playlistwin_get_toprow());
+                 node && playlistwin_item_visible(g_list_position(playlist_get(), node));
                  node = g_list_next(node)) {
+
                 entry = node->data;
-//                if (entry->title || entry->length != -1)
-                if (entry->tuple && (entry->tuple->mtime == playlist_get_mtime(entry->filename)))
+
+                if(entry->tuple && entry->tuple->mtime != 0) {
                     continue;
+                }
 
                 if (!playlist_entry_get_info(entry)) {
                     if (g_list_index(playlist_get(), entry) == -1)