This fixes a later assertion failure in module-stream-restore.
Buglink: https://bugs.launchpad.net/bugs/896602 Signed-off-by: David Henningsson <email address hidden> --- src/pulsecore/sink-input.c | 3 +++ src/pulsecore/source-output.c | 3 +++ 2 files changed, 6 insertions(+)
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index 6131bd3..8b9ee72 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -376,6 +376,9 @@ int pa_sink_input_new( data->save_volume = FALSE; }
+ if (!data->volume_writable) + data->save_volume = false; + pa_return_val_if_fail(pa_cvolume_compatible(&data->volume, &data->sample_spec), -PA_ERR_INVALID);
if (!data->muted_is_set) diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index d942419..96245c7 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -309,6 +309,9 @@ int pa_source_output_new( data->save_volume = FALSE; }
if (!data->volume_factor_is_set) -- 1.7.9.5
This fixes a later assertion failure in module- stream- restore.
Buglink: https:/ /bugs.launchpad .net/bugs/ 896602 sink-input. c | 3 +++ source- output. c | 3 +++
Signed-off-by: David Henningsson <email address hidden>
---
src/pulsecore/
src/pulsecore/
2 files changed, 6 insertions(+)
diff --git a/src/pulsecore /sink-input. c b/src/pulsecore /sink-input. c /sink-input. c /sink-input. c
data- >save_volume = FALSE;
index 6131bd3..8b9ee72 100644
--- a/src/pulsecore
+++ b/src/pulsecore
@@ -376,6 +376,9 @@ int pa_sink_input_new(
}
+ if (!data- >volume_ writable) return_ val_if_ fail(pa_ cvolume_ compatible( &data-> volume, &data-> sample_ spec), -PA_ERR_INVALID);
+ data->save_volume = false;
+
pa_
if (!data- >muted_ is_set) /source- output. c b/src/pulsecore /source- output. c /source- output. c /source- output. c output_ new(
data- >save_volume = FALSE;
diff --git a/src/pulsecore
index d942419..96245c7 100644
--- a/src/pulsecore
+++ b/src/pulsecore
@@ -309,6 +309,9 @@ int pa_source_
}
+ if (!data- >volume_ writable) return_ val_if_ fail(pa_ cvolume_ compatible( &data-> volume, &data-> sample_ spec), -PA_ERR_INVALID);
+ data->save_volume = false;
+
pa_
if (!data- >volume_ factor_ is_set)
--
1.7.9.5