Mercurial > audlegacy
changeset 1825:8b71a2b0577b trunk
[svn] - results from more profiling
| author | nenolod |
|---|---|
| date | Thu, 05 Oct 2006 03:26:36 -0700 |
| parents | 2a5621bfc610 |
| children | d66712838e9f |
| files | ChangeLog audacious/playlist.c audacious/ui_playlist.c |
| diffstat | 3 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 05 03:03:56 2006 -0700 +++ b/ChangeLog Thu Oct 05 03:26:36 2006 -0700 @@ -1,3 +1,12 @@ +2006-10-05 10:03:56 +0000 William Pitcock <nenolod@nenolod.net> + revision [2605] + - more mtime = 0 checks + - try to grab the tuple immediately on add + + trunk/audacious/playlist.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + + 2006-10-05 09:43:17 +0000 William Pitcock <nenolod@nenolod.net> revision [2603] - ditto for playlist_get_songtime().
--- a/audacious/playlist.c Thu Oct 05 03:03:56 2006 -0700 +++ b/audacious/playlist.c Thu Oct 05 03:26:36 2006 -0700 @@ -126,7 +126,7 @@ static void playlist_recalc_total_time_nolock(void); static void playlist_recalc_total_time(void); - +static gboolean playlist_entry_get_info(PlaylistEntry * entry); PlaylistEntry * playlist_entry_new(const gchar * filename, @@ -143,8 +143,9 @@ entry->selected = FALSE; entry->decoder = dec; + /* only do this if we have a decoder, otherwise it just takes too long */ if (entry->decoder) - entry->tuple = entry->decoder->get_song_tuple(entry->filename); + playlist_entry_get_info(entry); return entry; } @@ -1555,8 +1556,8 @@ entry = node->data; /* FIXME: simplify this logic */ - if ( (!entry->title && entry->length == -1) || - (entry->tuple && (entry->tuple->mtime != playlist_get_mtime(entry->filename))) ){ + if ((!entry->title && entry->length == -1) || + (entry->tuple && (entry->tuple->mtime > 0 && entry->tuple->mtime != playlist_get_mtime(entry->filename))) ){ if (playlist_entry_get_info(entry)) title = entry->title; }
--- a/audacious/ui_playlist.c Thu Oct 05 03:03:56 2006 -0700 +++ b/audacious/ui_playlist.c Thu Oct 05 03:26:36 2006 -0700 @@ -378,17 +378,9 @@ { gchar *posstr, *timestr, *title, *info; gint pos, time; - TitleInput *tuple = NULL; pos = playlist_get_position(); - tuple = playlist_get_tuple(pos); - - if(tuple){ - title = xmms_get_titlestring(tuple->formatter ? tuple->formatter : xmms_get_gentitle_format(), tuple); - } - else { - title = playlist_get_songtitle(pos); - } + title = playlist_get_songtitle(pos); if (!title) { textbox_set_text(playlistwin_sinfo, "");