mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

before applying balance/fade check it actually makes sense

Browse source
This commit is contained in:
Lennart Poettering 2009-02-03 04:05:41 +01:00
parent f9696c0e7f
commit 554c818d21
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pulse/volume.c
View file

@ -467,6 +467,9 @@ float pa_cvolume_get_balance(const pa_cvolume *v, const pa_channel_map *map) {
pa_assert(map); pa_assert(map);
pa_assert(map->channels == v->channels); pa_assert(map->channels == v->channels);
if (!pa_channel_map_can_balance(map))
return 0.0f;
get_avg_lr(map, v, &left, &right); get_avg_lr(map, v, &left, &right);
if (left == right) if (left == right)
@ -497,6 +500,9 @@ pa_cvolume* pa_cvolume_set_balance(pa_cvolume *v, const pa_channel_map *map, flo
pa_assert(new_balance >= -1.0f); pa_assert(new_balance >= -1.0f);
pa_assert(new_balance <= 1.0f); pa_assert(new_balance <= 1.0f);
if (!pa_channel_map_can_balance(map))
return v;
get_avg_lr(map, v, &left, &right); get_avg_lr(map, v, &left, &right);
m = PA_MAX(left, right); m = PA_MAX(left, right);
@ -584,6 +590,9 @@ float pa_cvolume_get_fade(const pa_cvolume *v, const pa_channel_map *map) {
pa_assert(map); pa_assert(map);
pa_assert(map->channels == v->channels); pa_assert(map->channels == v->channels);
if (!pa_channel_map_can_fade(map))
return 0.0f;
get_avg_fr(map, v, &front, &rear); get_avg_fr(map, v, &front, &rear);
if (front == rear) if (front == rear)
@ -605,6 +614,9 @@ pa_cvolume* pa_cvolume_set_fade(pa_cvolume *v, const pa_channel_map *map, float
pa_assert(new_fade >= -1.0f); pa_assert(new_fade >= -1.0f);
pa_assert(new_fade <= 1.0f); pa_assert(new_fade <= 1.0f);
if (!pa_channel_map_can_fade(map))
return v;
get_avg_fr(map, v, &front, &rear); get_avg_fr(map, v, &front, &rear);
m = PA_MAX(front, rear); m = PA_MAX(front, rear);

21
src/pulse/volume.h
View file

@ -236,7 +236,9 @@ int pa_cvolume_compatible(const pa_cvolume *v, const pa_sample_spec *ss) PA_GCC_
/** Calculate a 'balance' value for the specified volume with the /** Calculate a 'balance' value for the specified volume with the
* specified channel map. The return value will range from -1.0f * specified channel map. The return value will range from -1.0f
* (left) to +1.0f (right) \since 0.9.15 */ * (left) to +1.0f (right). If no balance value is applicable to this
* channel map the return value will always be 0.0f. See
* pa_channel_map_can_balance(). \since 0.9.15 */
float pa_cvolume_get_balance(const pa_cvolume *v, const pa_channel_map *map) PA_GCC_PURE; float pa_cvolume_get_balance(const pa_cvolume *v, const pa_channel_map *map) PA_GCC_PURE;
/** Adjust the 'balance' value for the specified volume with the /** Adjust the 'balance' value for the specified volume with the
@ -245,22 +247,27 @@ float pa_cvolume_get_balance(const pa_cvolume *v, const pa_channel_map *map) PA_
* operation might not be reversible! Also, after this call * operation might not be reversible! Also, after this call
* pa_cvolume_get_balance() is not guaranteed to actually return the * pa_cvolume_get_balance() is not guaranteed to actually return the
* requested balance value (e.g. when the input volume was zero anyway for * requested balance value (e.g. when the input volume was zero anyway for
* all channels) \since 0.9.15 */ * all channels). If no balance value is applicable to
* this channel map the volume will not be modified. See
* pa_channel_map_can_balance(). \since 0.9.15 */
pa_cvolume* pa_cvolume_set_balance(pa_cvolume *v, const pa_channel_map *map, float new_balance); pa_cvolume* pa_cvolume_set_balance(pa_cvolume *v, const pa_channel_map *map, float new_balance);
/** Calculate a 'fade' value (i.e. 'balance' between front and rear) /** Calculate a 'fade' value (i.e. 'balance' between front and rear)
* for the specified volume with the specified channel map. The return * for the specified volume with the specified channel map. The return
* value will range from -1.0f (rear) to +1.0f (left) \since * value will range from -1.0f (rear) to +1.0f (left). If no fade
* 0.9.15 */ * value is applicable to this channel map the return value will
* always be 0.0f. See pa_channel_map_can_fade(). \since 0.9.15 */
float pa_cvolume_get_fade(const pa_cvolume *v, const pa_channel_map *map) PA_GCC_PURE; float pa_cvolume_get_fade(const pa_cvolume *v, const pa_channel_map *map) PA_GCC_PURE;
/** Adjust the 'fade' value (i.e. 'balance' between front and rear) /** Adjust the 'fade' value (i.e. 'balance' between front and rear)
* for the specified volume with the specified channel map. v will be * for the specified volume with the specified channel map. v will be
* modified in place and returned. The balance is a value between * modified in place and returned. The balance is a value between
* -1.0f and +1.0f. This operation might not be reversible! Also, * -1.0f and +1.0f. This operation might not be reversible! Also,
* after this call pa_cvolume_get_fade() is not guaranteed to * after this call pa_cvolume_get_fade() is not guaranteed to actually
* actually return the requested fade value (e.g. when the input volume * return the requested fade value (e.g. when the input volume was
* was zero anyway for all channels) \since 0.9.15 */ * zero anyway for all channels). If no fade value is applicable to
* this channel map the volume will not be modified. See
* pa_channel_map_can_fade(). \since 0.9.15 */
pa_cvolume* pa_cvolume_set_fade(pa_cvolume *v, const pa_channel_map *map, float new_fade); pa_cvolume* pa_cvolume_set_fade(pa_cvolume *v, const pa_channel_map *map, float new_fade);
/** Scale the passed pa_cvolume structure so that the maximum volume /** Scale the passed pa_cvolume structure so that the maximum volume