changeset 1826:d66712838e9f trunk

[svn] - and finally special tuples are treated as they should be
author nenolod
date Thu, 05 Oct 2006 04:03:19 -0700
parents 8b71a2b0577b
children 628e908d78b6
files ChangeLog audacious/playlist.c
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 05 03:26:36 2006 -0700
+++ b/ChangeLog	Thu Oct 05 04:03:19 2006 -0700
@@ -1,3 +1,12 @@
+2006-10-05 10:26:36 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2607]
+  - results from more profiling
+  
+  trunk/audacious/playlist.c    |    9 +++++----
+  trunk/audacious/ui_playlist.c |   10 +---------
+  2 files changed, 6 insertions(+), 13 deletions(-)
+
+
 2006-10-05 10:03:56 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2605]
   - more mtime = 0 checks
--- a/audacious/playlist.c	Thu Oct 05 03:26:36 2006 -0700
+++ b/audacious/playlist.c	Thu Oct 05 04:03:19 2006 -0700
@@ -2184,7 +2184,7 @@
             for (node = playlist_get(); node; node = g_list_next(node)) {
                 entry = node->data;
 
-                if(entry->tuple && entry->tuple->mtime != 0) {
+                if(entry->tuple && (entry->tuple->length > -1)) {
                         continue;
                 }
 
@@ -2194,7 +2194,7 @@
                            Restart. */
                         node = playlist_get();
                 }
-                else if (entry->title || entry->length != -1) {
+                else if (entry->title || (!entry->tuple && entry->length != -1)) {
                     update_playlistwin = TRUE;
                     if (entry == playlist_position)
                         update_mainwin = TRUE;
@@ -2228,7 +2228,7 @@
 
                 entry = node->data;
 
-                if(entry->tuple && entry->tuple->mtime != 0) {
+                if(entry->tuple && (entry->tuple->length > -1)) {
                     continue;
                 }
 
@@ -2240,7 +2240,7 @@
                             g_list_nth(playlist_get(),
                                        playlistwin_get_toprow());
                 }
-                else if (entry->title || entry->length != -1) {
+                else if (entry->title || (!entry->tuple && entry->length != -1)) {
                     update_playlistwin = TRUE;
                     if (entry == playlist_position)
                         update_mainwin = TRUE;
@@ -2265,6 +2265,7 @@
         }
 
         if (update_mainwin) {
+
             mainwin_set_info_text();
             update_mainwin = FALSE;
         }