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

adapter-control: bundle the volume ramp parmeters with volume

Browse source
This commit is contained in:
Ashok Sidipotu 2023-03-30 10:10:33 +05:30 • committed by Wim Taymans
parent 74872250e8
commit b61bf8a27d
1 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
spa/examples/adapter-control.c
View file

@ -315,7 +315,6 @@ static unsigned int get_ramp_samples(struct data *data)
return data->volume_ramp_samples; return data->volume_ramp_samples;
else if (data->volume_ramp_time) { else if (data->volume_ramp_time) {
unsigned int samples = (data->volume_ramp_time * 48000) / 1000; unsigned int samples = (data->volume_ramp_time * 48000) / 1000;
// printf("volume ramp samples calculated from time %d\n", samples);
return samples; return samples;
} }
return 0; return 0;
@ -378,7 +377,12 @@ static int fade_in(struct data *data)
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_add_object(&b, props = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_Props, 0, SPA_TYPE_OBJECT_Props, 0,
SPA_PROP_volume, SPA_POD_Float(1.0)); SPA_PROP_volume, SPA_POD_Float(1.0),
SPA_PROP_volumeRampSamples, SPA_POD_Int(data->volume_ramp_samples),
SPA_PROP_volumeRampStepSamples, SPA_POD_Int(data->volume_ramp_step_samples),
SPA_PROP_volumeRampTime, SPA_POD_Int(data->volume_ramp_time),
SPA_PROP_volumeRampStepTime, SPA_POD_Int(data->volume_ramp_step_time),
SPA_PROP_volumeRampScale, SPA_POD_Id(data->scale));
if ((res = spa_node_set_param(data->sink_node, SPA_PARAM_Props, 0, props)) < 0) { if ((res = spa_node_set_param(data->sink_node, SPA_PARAM_Props, 0, props)) < 0) {
printf("can't call volramp set params %d\n", res); printf("can't call volramp set params %d\n", res);
return res; return res;
@ -425,7 +429,12 @@ static int fade_out(struct data *data)
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_add_object(&b, props = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_Props, 0, SPA_TYPE_OBJECT_Props, 0,
SPA_PROP_volume, SPA_POD_Float(0.0)); SPA_PROP_volume, SPA_POD_Float(0.0),
SPA_PROP_volumeRampSamples, SPA_POD_Int(data->volume_ramp_samples),
SPA_PROP_volumeRampStepSamples, SPA_POD_Int(data->volume_ramp_step_samples),
SPA_PROP_volumeRampTime, SPA_POD_Int(data->volume_ramp_time),
SPA_PROP_volumeRampStepTime, SPA_POD_Int(data->volume_ramp_step_time),
SPA_PROP_volumeRampScale, SPA_POD_Id(data->scale));
if ((res = spa_node_set_param(data->sink_node, SPA_PARAM_Props, 0, props)) < 0) { if ((res = spa_node_set_param(data->sink_node, SPA_PARAM_Props, 0, props)) < 0) {
printf("can't call volramp set params %d\n", res); printf("can't call volramp set params %d\n", res);
return res; return res;
@ -646,21 +655,6 @@ static int make_nodes(struct data *data)
return res; return res;
} }
if (spa_streq (data->mode, NATIVE)) {
spa_pod_builder_init(&b, buffer, sizeof(buffer));
props = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_Props, 0,
SPA_PROP_volumeRampSamples, SPA_POD_Int(data->volume_ramp_samples),
SPA_PROP_volumeRampStepSamples, SPA_POD_Int(data->volume_ramp_step_samples),
SPA_PROP_volumeRampTime, SPA_POD_Int(data->volume_ramp_time),
SPA_PROP_volumeRampStepTime, SPA_POD_Int(data->volume_ramp_step_time),
SPA_PROP_volumeRampScale, SPA_POD_Id(data->scale));
if ((res = spa_node_set_param(data->sink_node, SPA_PARAM_Props, 0, props)) < 0) {
printf("can't call volramp set params %d\n", res);
return res;
}
printf("updated volume ramp params\n");
}
/* set io buffers on source and sink nodes */ /* set io buffers on source and sink nodes */
data->source_sink_io[0] = SPA_IO_BUFFERS_INIT; data->source_sink_io[0] = SPA_IO_BUFFERS_INIT;
if ((res = spa_node_port_set_io(data->source_node, if ((res = spa_node_port_set_io(data->source_node,