Fix A2DP volume update after changes in 0d488c7

Author: arkq

src/ba-transport-pcm.c

@@ -591,16 +591,16 @@ bool ba_transport_pcm_is_active(const struct ba_transport_pcm *pcm) {
 
 /**
  * Convert PCM volume level to [0, max] range. */
-int ba_transport_pcm_volume_level_to_range(int value, int max) {
+unsigned int ba_transport_pcm_volume_level_to_range(int value, int max) {
 	int volume = audio_decibel_to_loudness(value / 100.0) * max;
 	return MIN(MAX(volume, 0), max);
 }
 
 /**
  * Convert [0, max] range to PCM volume level. */
 int ba_transport_pcm_volume_range_to_level(int value, int max) {
-	double level = audio_loudness_to_decibel(1.0 * value / max);
-	return MIN(MAX(level, -96.0), 96.0) * 100;
+	int level = audio_loudness_to_decibel(1.0 * value / max) * 100;
+	return MIN(MAX(level, -9600), 9600);
 }
 
 /**
@@ -656,8 +656,8 @@ int ba_transport_pcm_volume_update(struct ba_transport_pcm *pcm) {
 		for (size_t i = 0; i < pcm->channels; i++)
 			level_sum += pcm->volume[i].level;
 
-		unsigned int volume = ba_transport_pcm_volume_level_to_range(
-				level_sum / pcm->channels, BLUEZ_A2DP_VOLUME_MAX);
+		uint16_t volume = ba_transport_pcm_volume_level_to_range(
+				level_sum / (int)pcm->channels, BLUEZ_A2DP_VOLUME_MAX);
 
 		/* skip update if nothing has changed */
 		if (volume != t->a2dp.volume) {

src/ba-transport-pcm.h

@@ -238,7 +238,7 @@ enum ba_transport_pcm_signal ba_transport_pcm_signal_recv(
 
 bool ba_transport_pcm_is_active(const struct ba_transport_pcm *pcm);
 
-int ba_transport_pcm_volume_level_to_range(int value, int max);
+unsigned int ba_transport_pcm_volume_level_to_range(int value, int max);
 int ba_transport_pcm_volume_range_to_level(int value, int max);
 
 void ba_transport_pcm_volume_set(

utils/aplay/aplay.c

@@ -452,7 +452,7 @@ static int io_worker_mixer_volume_sync_snd_mixer_elem(
 	 * some kind of channel mapping. In order to simplify things, we will set
 	 * all channels to the average left-right volume. */
 
-	int volume_sum = 0, muted = 0;
+	unsigned int volume_sum = 0, muted = 0;
 	for (size_t i = 1; i < ba_pcm->channels; i++) {
 		volume_sum += ba_pcm->volume[i].volume;
 		muted |= ba_pcm->volume[i].muted;
@@ -461,7 +461,7 @@ static int io_worker_mixer_volume_sync_snd_mixer_elem(
 	/* keep local muted state up to date */
 	pcm_muted = muted;
 
-	const int vmax = BA_PCM_VOLUME_MAX(ba_pcm);
+	const unsigned int vmax = BA_PCM_VOLUME_MAX(ba_pcm);
 	/* convert loudness to dB using decibel formula */
 	long db = 10 * log2(1.0 * volume_sum / ba_pcm->channels / vmax) * 100;
 	db += worker->mixer_volume_db_max_value;