Mercurial > audlegacy
changeset 2283:35b8c6307b18 trunk
[svn] - avoid cpu raising when get_info_on_demand and get_info_on_load are both FALSE; and prevent the combo from happening at all
| author | giacomo |
|---|---|
| date | Fri, 05 Jan 2007 17:31:19 -0800 |
| parents | 210922903d20 |
| children | a4bb113088fb |
| files | ChangeLog audacious/main.c audacious/playlist.c |
| diffstat | 3 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 05 12:17:04 2007 -0800 +++ b/ChangeLog Fri Jan 05 17:31:19 2007 -0800 @@ -1,3 +1,11 @@ +2007-01-05 20:17:04 +0000 Michael Hanselmann <hansmi@forkbomb.ch> + revision [3572] + Translate new strings + + trunk/po/de.po | 68 ++++++++++++++++++++++++++++----------------------------- + 1 file changed, 34 insertions(+), 34 deletions(-) + + 2007-01-05 19:40:46 +0000 Michael Hanselmann <hansmi@forkbomb.ch> revision [3570] Switch to poedit, hence the big diff. Update fuzzy translations. New ones still left untouched.
--- a/audacious/main.c Fri Jan 05 12:17:04 2007 -0800 +++ b/audacious/main.c Fri Jan 05 17:31:19 2007 -0800 @@ -604,6 +604,10 @@ if (!cfg.session_uri_base) cfg.session_uri_base = g_strdup(""); + + /* at least one of these should be true */ + if ((!cfg.get_info_on_demand) && (!cfg.get_info_on_load)) + cfg.get_info_on_demand = TRUE; }
--- a/audacious/playlist.c Fri Jan 05 12:17:04 2007 -0800 +++ b/audacious/playlist.c Fri Jan 05 17:31:19 2007 -0800 @@ -2456,6 +2456,13 @@ playlist_get_info_scan_active = FALSE; g_mutex_unlock(mutex_scan); } + else /* not on_demand and not on_load... + NOTE: this shouldn't happen anymore, sanity check in bmp_config_load now */ + { + g_mutex_lock(mutex_scan); + playlist_get_info_scan_active = FALSE; + g_mutex_unlock(mutex_scan); + } if (update_playlistwin) { playlistwin_update_list(playlist);