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

pulse: update per channel volumes

Browse source 
Use the channelVolume property to update the individual channel
volumes.
Update property values to match pulseaudio.

Handle the case where the number of channels changes. In pulse this
can normally never happen. Emit a remove and add of the node when
this happens as to not confuse pulse clients.
This commit is contained in:
Wim Taymans 2019-08-12 12:31:55 +02:00
parent 5e2b740ee0
commit 69ad904b63
4 changed files with 211 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/stream.c
View file

@ -828,7 +828,7 @@ static int create_stream(pa_stream_direction_t direction,
int res;
enum pw_stream_flags fl;
const struct spa_pod *params[16];
uint32_t n_params = 0;
uint32_t i, n_params = 0;
uint8_t buffer[4096];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
uint32_t sample_rate = 0, stride = 0;
@ -847,10 +847,15 @@ static int create_stream(pa_stream_direction_t direction,
s->direction = direction;
s->timing_info_valid = false;
s->disconnecting = false;
if (volume)
s->volume = pa_cvolume_avg(volume) / (float) PA_VOLUME_NORM;
else
s->volume = 1.0;
if (volume) {
for (i = 0; i < volume->channels; i++)
s->channel_volumes[i] = volume->values[i] / (float) PA_VOLUME_NORM;
s->n_channel_volumes = volume->channels;
} else {
for (i = 0; i < SPA_AUDIO_MAX_CHANNELS; i++)
s->channel_volumes[i] = 1.0;
s->n_channel_volumes = 0;
}
s->mute = false;
pa_stream_set_state(s, PA_STREAM_CREATING);