diff options
| author | mark <mcampbellsmith@gmail.com> | 2013-08-21 21:20:32 +1000 |
|---|---|---|
| committer | mark <mcampbellsmith@gmail.com> | 2013-08-21 21:48:13 +1000 |
| commit | 329915b1b5922b1c08877c8e52b89f10d576a254 (patch) | |
| tree | 0e82060c049cc03750fc7c676e78f6d9117d286a /audio/audio_hw.h | |
| parent | ee4f6f600b0f59240e4a146ba346c5e21139e4a6 (diff) | |
| download | device_samsung_i9305-329915b1b5922b1c08877c8e52b89f10d576a254.zip device_samsung_i9305-329915b1b5922b1c08877c8e52b89f10d576a254.tar.gz device_samsung_i9305-329915b1b5922b1c08877c8e52b89f10d576a254.tar.bz2 | |
revert: i9305: user configureable voice/streaming volumes
This reverts this change from 10.1, but keeps the cleaned
up parts in audio_hw.c
Change-Id: I51dc154f56b873113c36bce7dbb969ade59159f9
Diffstat (limited to 'audio/audio_hw.h')
| -rw-r--r-- | audio/audio_hw.h | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/audio/audio_hw.h b/audio/audio_hw.h index 33050c3..4d99bc7 100644 --- a/audio/audio_hw.h +++ b/audio/audio_hw.h @@ -64,18 +64,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])) @@ -113,14 +104,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 @@ -172,8 +155,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 |