Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio

This commit is contained in:
Lennart Poettering 2008-10-06 02:39:24 +02:00
commit be667af03f
2 changed files with 7 additions and 0 deletions

View file

@ -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);
}

View file

@ -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