On 05/15/2013 02:28 PM, David Henningsson wrote: > This fixes a later assertion failure in module-stream-restore.
There were no comments, so I pushed this one now.
> > 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_writable) > + data->save_volume = false; > + > pa_return_val_if_fail(pa_cvolume_compatible(&data->volume, &data->sample_spec), -PA_ERR_INVALID); > > if (!data->volume_factor_is_set) >
-- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic
On 05/15/2013 02:28 PM, David Henningsson wrote: stream- restore.
> This fixes a later assertion failure in module-
There were no comments, so I pushed this one now.
> /bugs.launchpad .net/bugs/ 896602 sink-input. c | 3 +++ source- output. c | 3 +++ /sink-input. c b/src/pulsecore /sink-input. c /sink-input. c /sink-input. c >volume_ writable) val_if_ fail(pa_ cvolume_ compatible( &data-> volume, &data-> sample_ spec), -PA_ERR_INVALID); >muted_ is_set) /source- output. c b/src/pulsecore /source- output. c /source- output. c /source- output. c output_ new( >volume_ writable) val_if_ fail(pa_ cvolume_ compatible( &data-> volume, &data-> sample_ spec), -PA_ERR_INVALID); >volume_ factor_ is_set)
> Buglink: https:/
> Signed-off-by: David Henningsson <email address hidden>
> ---
> src/pulsecore/
> src/pulsecore/
> 2 files changed, 6 insertions(+)
>
> diff --git a/src/pulsecore
> index 6131bd3..8b9ee72 100644
> --- a/src/pulsecore
> +++ b/src/pulsecore
> @@ -376,6 +376,9 @@ int pa_sink_input_new(
> data->save_volume = FALSE;
> }
>
> + if (!data-
> + data->save_volume = false;
> +
> pa_return_
>
> if (!data-
> diff --git a/src/pulsecore
> index d942419..96245c7 100644
> --- a/src/pulsecore
> +++ b/src/pulsecore
> @@ -309,6 +309,9 @@ int pa_source_
> data->save_volume = FALSE;
> }
>
> + if (!data-
> + data->save_volume = false;
> +
> pa_return_
>
> if (!data-
>
-- /launchpad. net/~diwic
David Henningsson, Canonical Ltd.
https:/