comparison audacious/playlist.c @ 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 cf41677e2d7c
comparison
equal deleted inserted replaced
1825:8b71a2b0577b 1826:d66712838e9f
2182 2182
2183 PLAYLIST_LOCK(); 2183 PLAYLIST_LOCK();
2184 for (node = playlist_get(); node; node = g_list_next(node)) { 2184 for (node = playlist_get(); node; node = g_list_next(node)) {
2185 entry = node->data; 2185 entry = node->data;
2186 2186
2187 if(entry->tuple && entry->tuple->mtime != 0) { 2187 if(entry->tuple && (entry->tuple->length > -1)) {
2188 continue; 2188 continue;
2189 } 2189 }
2190 2190
2191 if (!playlist_entry_get_info(entry)) { 2191 if (!playlist_entry_get_info(entry)) {
2192 if (g_list_index(playlist_get(), entry) == -1) 2192 if (g_list_index(playlist_get(), entry) == -1)
2193 /* Entry disappeared while we looked it up. 2193 /* Entry disappeared while we looked it up.
2194 Restart. */ 2194 Restart. */
2195 node = playlist_get(); 2195 node = playlist_get();
2196 } 2196 }
2197 else if (entry->title || entry->length != -1) { 2197 else if (entry->title || (!entry->tuple && entry->length != -1)) {
2198 update_playlistwin = TRUE; 2198 update_playlistwin = TRUE;
2199 if (entry == playlist_position) 2199 if (entry == playlist_position)
2200 update_mainwin = TRUE; 2200 update_mainwin = TRUE;
2201 break; 2201 break;
2202 } 2202 }
2226 node && playlistwin_item_visible(g_list_position(playlist_get(), node)); 2226 node && playlistwin_item_visible(g_list_position(playlist_get(), node));
2227 node = g_list_next(node)) { 2227 node = g_list_next(node)) {
2228 2228
2229 entry = node->data; 2229 entry = node->data;
2230 2230
2231 if(entry->tuple && entry->tuple->mtime != 0) { 2231 if(entry->tuple && (entry->tuple->length > -1)) {
2232 continue; 2232 continue;
2233 } 2233 }
2234 2234
2235 if (!playlist_entry_get_info(entry)) { 2235 if (!playlist_entry_get_info(entry)) {
2236 if (g_list_index(playlist_get(), entry) == -1) 2236 if (g_list_index(playlist_get(), entry) == -1)
2238 looked it up. Restart. */ 2238 looked it up. Restart. */
2239 node = 2239 node =
2240 g_list_nth(playlist_get(), 2240 g_list_nth(playlist_get(),
2241 playlistwin_get_toprow()); 2241 playlistwin_get_toprow());
2242 } 2242 }
2243 else if (entry->title || entry->length != -1) { 2243 else if (entry->title || (!entry->tuple && entry->length != -1)) {
2244 update_playlistwin = TRUE; 2244 update_playlistwin = TRUE;
2245 if (entry == playlist_position) 2245 if (entry == playlist_position)
2246 update_mainwin = TRUE; 2246 update_mainwin = TRUE;
2247 found = TRUE; 2247 found = TRUE;
2248 break; 2248 break;
2263 playlistwin_update_list(); 2263 playlistwin_update_list();
2264 update_playlistwin = FALSE; 2264 update_playlistwin = FALSE;
2265 } 2265 }
2266 2266
2267 if (update_mainwin) { 2267 if (update_mainwin) {
2268
2268 mainwin_set_info_text(); 2269 mainwin_set_info_text();
2269 update_mainwin = FALSE; 2270 update_mainwin = FALSE;
2270 } 2271 }
2271 } 2272 }
2272 2273