diff options
| author | Max Kellermann <max@duempel.org> | 2011-07-20 21:46:05 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-07-20 21:46:05 +0200 |
| commit | 0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3 (patch) | |
| tree | d08d18c852febad9d6da94dfbe31545dcf93b5d0 /src/output | |
| parent | 57936a13741c09fa54a33a53ed05ac0d996e4807 (diff) | |
| parent | 838f7cd210dbd3f071d48d54c168c123c3d20c58 (diff) | |
| download | mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.tar.gz mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.tar.xz mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/player_thread.c
src/playlist_control.c
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/alsa_plugin.c | 8 | ||||
| -rw-r--r-- | src/output/httpd_output_plugin.c | 5 | ||||
| -rw-r--r-- | src/output/shout_plugin.c | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c index 1c8c7b7f7..0bbe231fd 100644 --- a/src/output/alsa_plugin.c +++ b/src/output/alsa_plugin.c @@ -508,6 +508,14 @@ configure_hw: g_debug("buffer_size=%u period_size=%u", (unsigned)alsa_buffer_size, (unsigned)alsa_period_size); + if (alsa_period_size == 0) + /* this works around a SIGFPE bug that occurred when + an ALSA driver indicated period_size==0; this + caused a division by zero in alsa_play(). By using + the fallback "1", we make sure that this won't + happen again. */ + alsa_period_size = 1; + ad->period_frames = alsa_period_size; ad->period_position = 0; diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c index 20098c90e..3f570c7b9 100644 --- a/src/output/httpd_output_plugin.c +++ b/src/output/httpd_output_plugin.c @@ -493,7 +493,8 @@ httpd_output_pause(void *data) if (has_clients) { static const char silence[1020]; - return httpd_output_play(data, silence, sizeof(silence), NULL); + return httpd_output_play(data, silence, sizeof(silence), + NULL) > 0; } else { g_usleep(100000); return true; @@ -522,7 +523,7 @@ httpd_output_tag(void *data, const struct tag *tag) /* flush the current stream, and end it */ - encoder_flush(httpd->encoder, NULL); + encoder_pre_tag(httpd->encoder, NULL); httpd_output_encoder_to_clients(httpd); /* send the tag to the encoder - which starts a new diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c index ec5fca3d9..7a4d70e70 100644 --- a/src/output/shout_plugin.c +++ b/src/output/shout_plugin.c @@ -518,7 +518,7 @@ static void my_shout_set_tag(void *data, if (sd->encoder->plugin->tag != NULL) { /* encoder plugin supports stream tags */ - ret = encoder_flush(sd->encoder, &error); + ret = encoder_pre_tag(sd->encoder, &error); if (!ret) { g_warning("%s", error->message); g_error_free(error); |