mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

the pointer to rewind() may actually be NULL

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2267 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-04-14 18:46:24 +00:00
parent 68e4a93705
commit 1f0a52dad1
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/pulsecore/sink-input.c
View file

@ -399,7 +399,6 @@ void pa_sink_input_put(pa_sink_input *i) {
pa_assert(i->state == PA_SINK_INPUT_INIT); pa_assert(i->state == PA_SINK_INPUT_INIT);
pa_assert(i->pop); pa_assert(i->pop);
pa_assert(i->rewind);
i->thread_info.state = i->state = i->flags & PA_SINK_INPUT_START_CORKED ? PA_SINK_INPUT_CORKED : PA_SINK_INPUT_RUNNING; i->thread_info.state = i->state = i->flags & PA_SINK_INPUT_START_CORKED ? PA_SINK_INPUT_CORKED : PA_SINK_INPUT_RUNNING;
i->thread_info.volume = i->volume; i->thread_info.volume = i->volume;
@ -611,7 +610,7 @@ void pa_sink_input_rewind(pa_sink_input *i, size_t nbytes /* in sink sample spec
pa_assert(PA_SINK_INPUT_LINKED(i->thread_info.state)); pa_assert(PA_SINK_INPUT_LINKED(i->thread_info.state));
pa_assert(pa_frame_aligned(nbytes, &i->sink->sample_spec)); pa_assert(pa_frame_aligned(nbytes, &i->sink->sample_spec));
pa_log_debug("rewind(%u, %u)", nbytes, i->thread_info.rewrite_nbytes); pa_log_debug("rewind(%lu, %lu)", (unsigned long) nbytes, (unsigned long) i->thread_info.rewrite_nbytes);
if (i->thread_info.state == PA_SINK_INPUT_CORKED) if (i->thread_info.state == PA_SINK_INPUT_CORKED)
return; return;
@ -623,7 +622,7 @@ void pa_sink_input_rewind(pa_sink_input *i, size_t nbytes /* in sink sample spec
} }
if (nbytes > 0) if (nbytes > 0)
pa_log_debug("Have to rewind %u bytes.", nbytes); pa_log_debug("Have to rewind %lu bytes.", (unsigned long) nbytes);
if (i->thread_info.rewrite_nbytes > 0) { if (i->thread_info.rewrite_nbytes > 0) {
size_t max_rewrite; size_t max_rewrite;

2
src/pulsecore/sink-input.h
View file

@ -103,7 +103,7 @@ struct pa_sink_input {
* before peek() if it is called at all. Only called if the sink * before peek() if it is called at all. Only called if the sink
* input driver ever plans to call * input driver ever plans to call
* pa_sink_input_request_rewrite(). Called from IO context. */ * pa_sink_input_request_rewrite(). Called from IO context. */
void (*rewind) (pa_sink_input *i, size_t nbytes); void (*rewind) (pa_sink_input *i, size_t nbytes); /* may be NULL */
/* Called whenever the maximum rewindable size of the sink /* Called whenever the maximum rewindable size of the sink
* changes. Called from UI context. */ * changes. Called from UI context. */