diff options
| author | sbrissen <sbrissen@hotmail.com> | 2013-08-20 15:51:40 -0400 |
|---|---|---|
| committer | sbrissen <sbrissen@hotmail.com> | 2013-08-20 15:52:17 -0400 |
| commit | c5de77275001eaede07fe3b072e701a1f9e2604c (patch) | |
| tree | 42215b396251a8cfde0263bed05a4a10dd2ec612 /audio/audio_hw.h | |
| parent | 76bc1378ff0b0df0e7fb0eaa2aece11f0bb83c84 (diff) | |
| download | device_samsung_t0lte-c5de77275001eaede07fe3b072e701a1f9e2604c.tar.gz device_samsung_t0lte-c5de77275001eaede07fe3b072e701a1f9e2604c.tar.bz2 device_samsung_t0lte-c5de77275001eaede07fe3b072e701a1f9e2604c.zip | |
Revert "t0lte: user configureable voice/streaming volumes [1/2]"
This reverts commit 56b68617e0dff7e1f4cf879b8531ad57037d9fac.
Conflicts:
overlay-cdma/device/samsung/smdk4412-common/DeviceSettings/res/values/config.xml
rootdir/init.smdk4x12.rc
Change-Id: I927c0eba5c25dac3ebe3b2ed6af81f943f838bdf
Diffstat (limited to 'audio/audio_hw.h')
| -rw-r--r-- | audio/audio_hw.h | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/audio/audio_hw.h b/audio/audio_hw.h index 97c9737..a35fd5a 100644 --- a/audio/audio_hw.h +++ b/audio/audio_hw.h @@ -66,18 +66,9 @@ /* sampling rate when using VX port for wide band */ #define VX_WB_SAMPLING_RATE 16000 -#define MAX_NUM_VOLUME_FILES 6 -#define AUDIO_DIR "/data/local/audio" - -/* in-call files */ -#define INCALL_EARPIECE "/data/local/audio/incall_earpiece" -#define INCALL_HEADPHONE "/data/local/audio/incall_headphone" -#define INCALL_SPEAKER "/data/local/audio/incall_speaker" -#define INCALL_BT "/data/local/audio/incall_bt" - -/* out stream files */ -#define OUT_HEADPHONE "/data/local/audio/out_headphone" -#define OUT_SPEAKER "/data/local/audio/out_speaker" +/* product-specific defines */ +#define PRODUCT_DEVICE_PROPERTY "ro.product.device" +#define PRODUCT_NAME_PROPERTY "ro.product.name" #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) @@ -115,15 +106,6 @@ enum tty_modes { TTY_MODE_FULL }; -char *volume_file[MAX_NUM_VOLUME_FILES] = { - INCALL_EARPIECE, - INCALL_HEADPHONE, - INCALL_SPEAKER, - INCALL_BT, - OUT_HEADPHONE, - OUT_SPEAKER -}; - /* ACDB Device ID macros */ #define DEVICE_HANDSET_RX_ACDB_ID 7 // HANDSET_SPKR #define DEVICE_HANDSET_TX_ACDB_ID 4 // HANDSET_MIC @@ -175,8 +157,6 @@ struct mixer_ctls { struct mixer_ctl *mixinl_in1l_volume; struct mixer_ctl *mixinl_in2l_volume; - struct mixer_ctl *speaker_volume; - struct mixer_ctl *headphone_volume; }; struct route_setting |