From 249dcd967ede5ad20cda92a7c6c85ba303eed87f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 14 Aug 2012 21:46:43 +0200 Subject: output/httpd: move delay from _pause() to _delay() --- src/output/httpd_output_plugin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/output/httpd_output_plugin.c') diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c index a063479db..abef826bc 100644 --- a/src/output/httpd_output_plugin.c +++ b/src/output/httpd_output_plugin.c @@ -428,6 +428,11 @@ httpd_output_delay(struct audio_output *ao) will not fill the buffer and it will not update the timer; therefore, we reset the timer here */ timer_reset(httpd->timer); + + /* some arbitrary delay that is long enough to avoid + consuming too much CPU, and short enough to notice + new clients quickly enough */ + return 1000; } return httpd->timer->started @@ -535,7 +540,6 @@ httpd_output_pause(struct audio_output *ao) return httpd_output_play(ao, silence, sizeof(silence), NULL) > 0; } else { - g_usleep(100000); return true; } } -- cgit v1.2.3