Mercurial > audlegacy
changeset 3806:fbe7468efaea trunk
Automated merge with file:/home/ccr/audacious/core
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 01 Oct 2007 21:25:24 +0300 |
| parents | c3d2de7c4151 (current diff) 30ef1287da19 (diff) |
| children | 62ff6b6f9ce0 |
| files | |
| diffstat | 4 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/effect.c Sun Sep 30 19:00:59 2007 +0300 +++ b/src/audacious/effect.c Mon Oct 01 21:25:24 2007 +0300 @@ -83,7 +83,6 @@ if (!node || !(node->data)) return; ep = node->data; - ep->enabled = enable; if (enable && !ep->enabled) { ep_data.enabled_list = g_list_append(ep_data.enabled_list, ep); @@ -95,6 +94,8 @@ if (ep->cleanup) ep->cleanup(); } + + ep->enabled = enable; } GList *
--- a/src/audacious/playback.c Sun Sep 30 19:00:59 2007 +0300 +++ b/src/audacious/playback.c Mon Oct 01 21:25:24 2007 +0300 @@ -59,8 +59,20 @@ #include "playback.h" #include "playback_evlisteners.h" -static int song_info_timeout_source = 0; +static gint song_info_timeout_source = 0; +static gint update_vis_timeout_source = 0; +/* XXX: there has to be a better way than polling here! */ +static gboolean +playback_update_vis_func(gpointer unused) +{ + if (!playback_get_playing()) + return FALSE; + + input_update_vis(playback_get_time()); + + return TRUE; +} static gint playback_set_pb_ready(InputPlayback *playback) @@ -153,6 +165,9 @@ song_info_timeout_source = g_timeout_add(1000, (GSourceFunc) mainwin_update_song_info, NULL); + update_vis_timeout_source = g_timeout_add(10, + (GSourceFunc) playback_update_vis_func, NULL); + if (cfg.player_shaded) { gtk_widget_show(mainwin_stime_min); gtk_widget_show(mainwin_stime_sec);
--- a/src/audacious/ui_main.c Sun Sep 30 19:00:59 2007 +0300 +++ b/src/audacious/ui_main.c Mon Oct 01 21:25:24 2007 +0300 @@ -2666,9 +2666,6 @@ { static gint count = 0; - if (playback_get_playing()) - input_update_vis(playback_get_time()); - GDK_THREADS_ENTER(); if (!count) {
--- a/src/audacious/ui_main.h Sun Sep 30 19:00:59 2007 +0300 +++ b/src/audacious/ui_main.h Mon Oct 01 21:25:24 2007 +0300 @@ -35,7 +35,7 @@ #define MAINWIN_SHADED_WIDTH MAINWIN_WIDTH #define MAINWIN_SHADED_HEIGHT MAINWIN_TITLEBAR_HEIGHT -#define MAINWIN_UPDATE_INTERVAL 10 +#define MAINWIN_UPDATE_INTERVAL 100 #define MAINWIN_DEFAULT_POS_X 20 #define MAINWIN_DEFAULT_POS_Y 20