The suspend cause isn't yet used by any of the callbacks. The alsa sink
and source will use it to sync the mixer when the SESSION suspend cause
is removed. Currently the syncing is done in pa_sink/source_suspend(),
and I want to change that, because pa_sink/source_suspend() shouldn't
have any alsa specific code.
---
src/modules/alsa/alsa-sink.c | 2 +-
src/modules/alsa/alsa-source.c | 2 +-
src/modules/echo-cancel/module-echo-cancel.c | 4 ++--
src/modules/macosx/module-coreaudio-device.c | 4 ++--
src/modules/module-combine-sink.c| 7 ++-
src/modules/module-equalizer-sink.c | 2 +-
src/modules/module-ladspa-sink.c | 2 +-
src/modules/module-remap-sink.c | 2 +-
src/modules/module-remap-source.c| 2 +-
src/modules/module-tunnel.c | 14 --
src/modules/module-virtual-sink.c| 2 +-
src/modules/module-virtual-source.c | 4 ++--
src/modules/module-virtual-surround-sink.c | 2 +-
src/pulsecore/sink.c | 6 +++---
src/pulsecore/sink.h | 12 ++--
src/pulsecore/source.c | 6 +++---
src/pulsecore/source.h | 12 ++--
17 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 5de52d542..5c8ccf319 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1230,7 +1230,7 @@ static int sink_process_msg(pa_msgobject *o, int code,
void *data, int64_t offse
}
/* Called from main context */
-static int sink_set_state_cb(pa_sink *s, pa_sink_state_t new_state) {
+static int sink_set_state_cb(pa_sink *s, pa_sink_state_t new_state,
pa_suspend_cause_t new_suspend_cause) {
pa_sink_state_t old_state;
struct userdata *u;
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index cdafa580f..fec6c4e0e 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1085,7 +1085,7 @@ static int source_process_msg(pa_msgobject *o, int code,
void *data, int64_t off
}
/* Called from main context */
-static int source_set_state_cb(pa_source *s, pa_source_state_t new_state) {
+static int source_set_state_cb(pa_source *s, pa_source_state_t new_state,
pa_suspend_cause_t new_suspend_cause) {
pa_source_state_t old_state;
struct userdata *u;
diff --git a/src/modules/echo-cancel/module-echo-cancel.c
b/src/modules/echo-cancel/module-echo-cancel.c
index 0702f2fd6..8e416563f 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -477,7 +477,7 @@ static int sink_process_msg_cb(pa_msgobject *o, int code,
void *data, int64_t of
}
/* Called from main context */
-static int source_set_state_cb(pa_source *s, pa_source_state_t state) {
+static int source_set_state_cb(pa_source *s, pa_source_state_t state,
pa_suspend_cause_t suspend_cause) {
struct userdata *u;
pa_source_assert_ref(s);
@@ -502,7 +502,7 @@ static int source_set_state_cb(pa_source *s,
pa_source_state_t state) {
}
/* Called from main context */
-static int sink_set_state_cb(pa_sink *s, pa_sink_state_t state) {
+static int sink_set_state_cb(pa_sink *s, pa_sink_state_t state,
pa_suspend_cause_t suspend_cause) {
struct userdata *u;
pa_sink_assert_ref(s);
diff --git a/src/modules/macosx/module-coreaudio-device.c
b/src/modules/macosx/module-coreaudio-device.c
index 73e332a31..f9ef7c5a0 100644
--- a/src/modules/macosx/module-coreaudio-device.c
+++ b/src/modules/macosx/module-coreaudio-device.c
@@ -353,7 +353,7 @@ static int source_process_msg(pa_msgobject *o, int code,
void *data, int64_t off
return pa_source_process_msg(o, code, data, offset, chunk);;
}
-static int ca_sink_set_state(pa_sink *s, pa_sink_state_t state) {
+static int ca_sink_set_state(pa_sink *s, pa_sink_state_t state,
pa_suspend_cause_t suspend_cause) {
coreaudio_sink *sink = s->userdata;
switch (state) {
@@ -511,7 +511,7 @@ static int ca_device_create_sink(pa_module *m, AudioBuffer
*buf, int channel_idx
return 0;
}
-static int ca_source_set_state(pa_source *s, pa_source_state_t state) {
+static int ca_source_set_state(pa_source *s, pa_source_state_t state,
pa_suspend_cause_t suspend_cause) {
coreaudio_source *source = s->userdata;
switch (state) {
diff --git a/src/modules/module-combine-sink.c
b/src/modules/module-combine-sink.c
index baaac44d5..7a80028ae 100644
--- a/src/modules/module-combine-sink.c
+++ b/src/modules/module-combine-sink.c
@@ -680,12 +680,17 @@ static void unsuspend(struct userdata *u) {
}
/* Called from main context */
-static int sink_set_state(pa_sink *sink, pa_sink_state_t state) {
+static int sink_set_state(pa_sink *sink, pa_sink_state_t state,
pa_suspend_cause_t suspend_cause) {
struct userdata *u;
