nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Still at it for 0c7b787. Might be done now. 

Change-Id: Idf45731dc6554954747f6036dc6dfcd4b63981a1
This commit is contained in:
Michael Sevakis 2013-04-15 14:58:00 -04:00
parent 9e71fd16a5
commit 5261b19bdf
7 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/SOURCES
View File

@ -159,11 +159,12 @@ radio/radioart.c
#endif
#endif
fixedpoint.c
#if CONFIG_CODEC == SWCODEC
#if INPUT_SRC_CAPS != 0
audio_path.c
#endif /* INPUT_SRC_CAPS != 0 */
fixedpoint.c
pcmbuf.c
codec_thread.c
playback.c

2
firmware/drivers/audio/wm8758.c
View File

@ -150,7 +150,7 @@ void audiohw_set_volume(int vol_l, int vol_r)
wmcodec_write(ROUT1VOL, amp_r | ROUT1VOL_ROUT1ZC | ROUT1VOL_OUT1VU);
}
void audiohw_set_lineout_vol(int vol_l, int vol_r)
void audiohw_set_lineout_volume(int vol_l, int vol_r)
{
int dac_l, amp_l, dac_r, amp_r;
get_volume_params(vol_l, &dac_l, &amp_l);

2
firmware/drivers/audio/wm8975.c
View File

@ -178,7 +178,7 @@ void audiohw_set_volume(int vol_l, int vol_r)
wm8975_write(ROUT1VOL, ROUT1VOL_RO1VU | ROUT1VOL_RO1ZC | vol_r);
}
void audiohw_set_lineout_vol(int vol_l, int vol_r)
void audiohw_set_lineout_volume(int vol_l, int vol_r)
{
vol_l = vol_tenthdb2hw(vol_l);
vol_r = vol_tenthdb2hw(vol_r);

2
firmware/export/hosted_codec.h
View File

@ -46,6 +46,6 @@ AUDIOHW_SETTING(BASS_CUTOFF, "", 0, 1, 1, 4, 1)
#if defined(AUDIOHW_HAVE_TREBLE_CUTOFF)
AUDIOHW_SETTING(TREBLE_CUTOFF, "", 0, 1, 1, 4, 1)
#endif
/* CONFIG_PLATFORM & PLATFORM_ANDROID */
#endif /* CONFIG_PLATFORM & PLATFORM_ANDROID */
#endif /* HOSTED_CODEC_H */

6
firmware/export/mas35xx.h
View File

@ -43,9 +43,9 @@
#define VOLUME_MAX 180
#define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP)
AUDIOHW_SETTING(SOUND_VOLUME, "dB", 0, 1, -78, 18, -18)
AUDIOHW_SETTING(SOUND_BASS, "dB", 0, 1, -15, 15, 7)
AUDIOHW_SETTING(SOUND_TREBLE, "dB", 0, 1, -15, 15, 7)
AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -78, 18, -18)
AUDIOHW_SETTING(BASS, "dB", 0, 1, -15, 15, 7)
AUDIOHW_SETTING(TREBLE, "dB", 0, 1, -15, 15, 7)
/* I2C defines */
#define MAS_ADR 0x3a

10
firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c
View File

@ -22,16 +22,6 @@
#include "kernel.h"
#include "sound.h"
const struct sound_settings_info audiohw_settings[] = {
[SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25},
[SOUND_BASS] = {"dB", 1, 15, -60, 90, 0},
[SOUND_TREBLE] = {"dB", 1, 15, -60, 90, 0},
[SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0},
[SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0},
[SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100},
};
void audiohw_init(void)
{
}

2
firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
View File

@ -270,7 +270,7 @@ void audiohw_init(void)
i2s_codec_init();
}
void audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_volume(int vol_l, int vol_r)
{
#ifdef HAVE_SW_VOLUME_CONTROL
/* SW volume for <= 1.0 gain, HW at unity, < VOLUME_MIN == MUTE */