diff options
Diffstat (limited to 'src/pulse/stream.c')
| -rw-r--r-- | src/pulse/stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pulse/stream.c b/src/pulse/stream.c index addc36ae..aac18a31 100644 --- a/src/pulse/stream.c +++ b/src/pulse/stream.c @@ -29,10 +29,10 @@ #include <string.h> #include <pulse/def.h> -#include <pulse/stream.h> #include <pulse/timeval.h> #include <pulse/rtclock.h> #include <pulse/xmalloc.h> +#include <pulse/fork-detect.h> #include <pulsecore/pstream-util.h> #include <pulsecore/log.h> @@ -41,8 +41,8 @@ #include <pulsecore/core-rtclock.h> #include <pulsecore/core-util.h> -#include "fork-detect.h" #include "internal.h" +#include "stream.h" #define AUTO_TIMING_INTERVAL_START_USEC (10*PA_USEC_PER_MSEC) #define AUTO_TIMING_INTERVAL_END_USEC (1500*PA_USEC_PER_MSEC) @@ -790,7 +790,7 @@ void pa_command_overflow_or_underflow(pa_pdispatch *pd, uint32_t command, uint32 s->underflow_callback(s, s->underflow_userdata); } - finish: +finish: pa_context_unref(c); } @@ -925,7 +925,7 @@ void pa_create_stream_callback(pa_pdispatch *pd, uint32_t command, uint32_t tag, if (pa_tagstruct_getu32(t, &s->channel) < 0 || s->channel == PA_INVALID_INDEX || - ((s->direction != PA_STREAM_UPLOAD) && (pa_tagstruct_getu32(t, &s->stream_index) < 0 || s->stream_index == PA_INVALID_INDEX)) || + ((s->direction != PA_STREAM_UPLOAD) && (pa_tagstruct_getu32(t, &s->stream_index) < 0 || s->stream_index == PA_INVALID_INDEX)) || ((s->direction != PA_STREAM_RECORD) && pa_tagstruct_getu32(t, &requested_bytes) < 0)) { pa_context_fail(s->context, PA_ERR_PROTOCOL); goto finish; |