diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-10-06 02:39:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-10-06 02:39:24 +0200 |
| commit | be667af03f37205faacc9a5ecd19928f9d2201f5 (patch) | |
| tree | 432ba95dc366c62b3c39d42129f313790ea394fb | |
| parent | 0274651f88adf704ba7afb6a46a35dd7921a4c7c (diff) | |
| parent | aa4373962cef6c00b16e229ff6165c144d322ccb (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
| -rw-r--r-- | src/pulsecore/protocol-native.c | 4 | ||||
| -rw-r--r-- | src/pulsecore/sink-input.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 5c6dbf44..778aab57 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -3168,6 +3168,10 @@ static void command_cork_playback_stream(pa_pdispatch *pd, uint32_t command, uin CHECK_VALIDITY(c->pstream, playback_stream_isinstance(s), tag, PA_ERR_NOENTITY); pa_sink_input_cork(s->sink_input, b); + + if (b) + s->is_underrun = TRUE; + pa_pstream_send_simple_ack(c->pstream, tag); } diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index 326a7e2c..4f70347f 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -1030,6 +1030,9 @@ void pa_sink_input_set_state_within_thread(pa_sink_input *i, pa_sink_input_state } else if (uncorking) { + i->thread_info.underrun_for = (uint64_t) -1; + i->thread_info.playing_for = 0; + pa_log_debug("Requesting rewind due to uncorking"); /* OK, we're being uncorked. Make sure we're not rewound when |