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

virtual sinks and sources: Revert commits

Browse source 
This patch reverts commit db4fbb0121 and
3bb94c4e83. They were the wrong approach
to fix the bug (and did not fix it anyway).
This commit is contained in:
Georg Chini 2017-05-18 07:46:08 +02:00
parent 4c6843f020
commit 00aeedfe98
7 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/echo-cancel/module-echo-cancel.c
View file

@ -409,8 +409,7 @@ static int source_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t
* make sure we don't access it in that time. Also, the * make sure we don't access it in that time. Also, the
* source output is first shut down, the source second. */ * source output is first shut down, the source second. */
if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state) || if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state) ||
!PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state) || !PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state)) {
!u->source_output->source) {
*((int64_t*) data) = 0; *((int64_t*) data) = 0;
return 0; return 0;
} }
@ -446,8 +445,7 @@ static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t of
* make sure we don't access it in that time. Also, the * make sure we don't access it in that time. Also, the
* sink input is first shut down, the sink second. */ * sink input is first shut down, the sink second. */
if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) || if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) ||
!PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state) || !PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state)) {
!u->sink_input->sink) {
*((int64_t*) data) = 0; *((int64_t*) data) = 0;
return 0; return 0;
} }

3
src/modules/module-ladspa-sink.c
View file

@ -347,8 +347,7 @@ static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t of
* make sure we don't access it in that time. Also, the * make sure we don't access it in that time. Also, the
* sink input is first shut down, the sink second. */ * sink input is first shut down, the sink second. */
if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) || if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) ||
!PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state) || !PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state)) {
!u->sink_input->sink) {
*((int64_t*) data) = 0; *((int64_t*) data) = 0;
return 0; return 0;
} }

3
src/modules/module-remap-sink.c
View file

@ -83,8 +83,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
/* The sink is _put() before the sink input is, so let's /* The sink is _put() before the sink input is, so let's
* make sure we don't access it yet */ * make sure we don't access it yet */
if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) || if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) ||
!PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state) || !PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state)) {
!u->sink_input->sink) {
*((int64_t*) data) = 0; *((int64_t*) data) = 0;
return 0; return 0;
} }

3
src/modules/module-remap-source.c
View file

@ -91,8 +91,7 @@ static int source_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t
* make sure we don't access it in that time. Also, the * make sure we don't access it in that time. Also, the
* source output is first shut down, the source second. */ * source output is first shut down, the source second. */
if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state) || if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state) ||
!PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state) || !PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state)) {
!u->source_output->source) {
*((int64_t*) data) = 0; *((int64_t*) data) = 0;
return 0; return 0;
} }

3
src/modules/module-virtual-sink.c
View file

@ -94,8 +94,7 @@ static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t of
* make sure we don't access it in that time. Also, the * make sure we don't access it in that time. Also, the
* sink input is first shut down, the sink second. */ * sink input is first shut down, the sink second. */
if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) || if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) ||
!PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state) || !PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state)) {
!u->sink_input->sink) {
*((int64_t*) data) = 0; *((int64_t*) data) = 0;
return 0; return 0;
} }

3
src/modules/module-virtual-source.c
View file

@ -175,8 +175,7 @@ static int source_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t
* make sure we don't access it in that time. Also, the * make sure we don't access it in that time. Also, the
* source output is first shut down, the source second. */ * source output is first shut down, the source second. */
if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state) || if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state) ||
!PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state) || !PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state)) {
!u->source_output->source) {
*((pa_usec_t*) data) = 0; *((pa_usec_t*) data) = 0;
return 0; return 0;
} }

3
src/modules/module-virtual-surround-sink.c
View file

@ -122,8 +122,7 @@ static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t of
* make sure we don't access it in that time. Also, the * make sure we don't access it in that time. Also, the
* sink input is first shut down, the sink second. */ * sink input is first shut down, the sink second. */
if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) || if (!PA_SINK_IS_LINKED(u->sink->thread_info.state) ||
!PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state) || !PA_SINK_INPUT_IS_LINKED(u->sink_input->thread_info.state)) {
!u->sink_input->sink) {
*((int64_t*) data) = 0; *((int64_t*) data) = 0;
return 0; return 0;
} }