diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-14 23:58:54 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-14 23:58:54 +0200 |
| commit | 7d27d2ea5e8b622a288c80518bc0daec53dbbc93 (patch) | |
| tree | b1b9e98369919d66869b3ff1626372bf16a38c23 /src/output/jack_output_plugin.c | |
| parent | 5cc3338267214eb050e39bc509d8b4258cec6afd (diff) | |
| parent | dc22846d58264bfae3b4516e2de1614b3b97a5ca (diff) | |
| download | mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.tar.gz mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.tar.xz mpd-7d27d2ea5e8b622a288c80518bc0daec53dbbc93.zip | |
Merge branch 'v0.17.x'
Diffstat (limited to 'src/output/jack_output_plugin.c')
| -rw-r--r-- | src/output/jack_output_plugin.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/output/jack_output_plugin.c b/src/output/jack_output_plugin.c index a24cb8557..d5c8ca412 100644 --- a/src/output/jack_output_plugin.c +++ b/src/output/jack_output_plugin.c @@ -608,6 +608,16 @@ mpd_jack_close(G_GNUC_UNUSED struct audio_output *ao) mpd_jack_stop(jd); } +static unsigned +mpd_jack_delay(struct audio_output *ao) +{ + struct jack_data *jd = (struct jack_data *)ao; + + return jd->base.pause && jd->pause && !jd->shutdown + ? 1000 + : 0; +} + static inline jack_default_audio_sample_t sample_16_to_jack(int16_t sample) { @@ -727,10 +737,6 @@ mpd_jack_pause(struct audio_output *ao) jd->pause = true; - /* due to a MPD API limitation, we have to sleep a little bit - here, to avoid hogging the CPU */ - g_usleep(50000); - return true; } @@ -742,6 +748,7 @@ const struct audio_output_plugin jack_output_plugin = { .enable = mpd_jack_enable, .disable = mpd_jack_disable, .open = mpd_jack_open, + .delay = mpd_jack_delay, .play = mpd_jack_play, .pause = mpd_jack_pause, .close = mpd_jack_close, |