summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-01 12:53:42 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-01 12:55:52 -0400
commit6d47dc9a8860a17a9e630b8662f33df63011bad9 (patch)
tree53f3a7ad38fa0f739b366b4f98dd40eb90921f4d /firmware
parente43726df2cd1cb8275234d60b818d417cfe730b5 (diff)
downloadrockbox-6d47dc9a8860a17a9e630b8662f33df63011bad9.tar.gz
rockbox-6d47dc9a8860a17a9e630b8662f33df63011bad9.tar.bz2
rockbox-6d47dc9a8860a17a9e630b8662f33df63011bad9.zip
fix some of the red introduced in e43726d
Change-Id: Id1abb0dd11f8a8e79a80fc54e58a5a22706a03ad
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/audio/nwzlinux-codec.c2
-rw-r--r--firmware/export/config/agptekrocker.h3
-rw-r--r--firmware/export/config/xduoox20.h6
-rw-r--r--firmware/export/config/xduoox3ii.h3
-rw-r--r--firmware/target/hosted/sonynwz/debug-nwz.c2
5 files changed, 4 insertions, 12 deletions
diff --git a/firmware/drivers/audio/nwzlinux-codec.c b/firmware/drivers/audio/nwzlinux-codec.c
index 33059d2aec..ca5e274255 100644
--- a/firmware/drivers/audio/nwzlinux-codec.c
+++ b/firmware/drivers/audio/nwzlinux-codec.c
@@ -416,7 +416,7 @@ void audiohw_set_volume(int vol_l, int vol_r)
printf(" set driver volume %d (%d dB)\n", drv_vol, curve->level[drv_vol] / 10);
nwz_set_driver_vol(drv_vol);
printf(" set digital volume %d dB\n", vol / 10);
- pcm_alsa_set_digital_volume(vol / 10);
+ pcm_alsa_set_digital_volume(vol / 10, vol / 10);
}
void audiohw_close(void)
diff --git a/firmware/export/config/agptekrocker.h b/firmware/export/config/agptekrocker.h
index f14e65f7e9..90fd2267fe 100644
--- a/firmware/export/config/agptekrocker.h
+++ b/firmware/export/config/agptekrocker.h
@@ -17,9 +17,6 @@
#define CONFIG_PLATFORM (PLATFORM_HOSTED)
#endif
-
-
-
/* define this if you have a colour LCD */
#define HAVE_LCD_COLOR
diff --git a/firmware/export/config/xduoox20.h b/firmware/export/config/xduoox20.h
index 5da5ee00f3..28a19baaae 100644
--- a/firmware/export/config/xduoox20.h
+++ b/firmware/export/config/xduoox20.h
@@ -17,9 +17,6 @@
#define CONFIG_PLATFORM (PLATFORM_HOSTED)
#endif
-
-
-
/* define this if you have a colour LCD */
#define HAVE_LCD_COLOR
@@ -84,6 +81,7 @@
/* We have usb power and can detect usb but it is handled by Linux */
#define HAVE_USB_POWER
+#define AUDIOHW_HAVE_SET_OUTPUT
#endif
#define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE
@@ -119,8 +117,6 @@
/* HW codec is flexible */
#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192
-#define AUDIOHW_HAVE_SET_OUTPUT
-
/* Battery */
#define BATTERY_CAPACITY_DEFAULT 2400 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 2400 /* min. capacity selectable */
diff --git a/firmware/export/config/xduoox3ii.h b/firmware/export/config/xduoox3ii.h
index 678577f5f4..02e8a57909 100644
--- a/firmware/export/config/xduoox3ii.h
+++ b/firmware/export/config/xduoox3ii.h
@@ -81,6 +81,7 @@
/* We have usb power and can detect usb but it is handled by Linux */
#define HAVE_USB_POWER
+#define AUDIOHW_HAVE_SET_OUTPUT
#endif
#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
@@ -116,8 +117,6 @@
/* HW codec is flexible */
#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192
-#define AUDIOHW_HAVE_SET_OUTPUT
-
/* Battery */
#define BATTERY_CAPACITY_DEFAULT 2000 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 2000 /* min. capacity selectable */
diff --git a/firmware/target/hosted/sonynwz/debug-nwz.c b/firmware/target/hosted/sonynwz/debug-nwz.c
index 0c0b494330..c9a430e7c2 100644
--- a/firmware/target/hosted/sonynwz/debug-nwz.c
+++ b/firmware/target/hosted/sonynwz/debug-nwz.c
@@ -369,7 +369,7 @@ bool dbg_hw_info_audio(void)
{
case VOL:
vol += inc ? 1 : -1;
- pcm_alsa_set_digital_volume(vol);
+ pcm_alsa_set_digital_volume(vol, vol);
break;
case ACOUSTIC:
audiohw_enable_acoustic(!audiohw_acoustic_enabled());