Merged release 0.15.2 from branch 'v0.15.x'

Conflicts:

	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2009-08-15 21:18:38 +02:00
11 changed files with 157 additions and 71 deletions

View File

@@ -448,8 +448,15 @@ my_shout_play(void *data, const void *chunk, size_t size, GError **error)
static bool
my_shout_pause(void *data)
{
struct shout_data *sd = (struct shout_data *)data;
static const char silence[1020];
if (shout_delay(sd->shout_conn) > 500) {
/* cap the latency for unpause */
g_usleep(500000);
return true;
}
return my_shout_play(data, silence, sizeof(silence), NULL);
}