summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-17 11:33:06 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-17 11:33:06 -0800
commit85b8c2381ba1907c87785a040c7dcc06e42b88de (patch)
tree6996d120c4217c23bcca4b8219551ddbe275cb71 /audio
parente05911dcfd5b415d309639a64b70b12041d4bfcd (diff)
parentd9733c4318c7303cd03ed4463b4e0c2ab7679a91 (diff)
downloaddevice_samsung_tuna-85b8c2381ba1907c87785a040c7dcc06e42b88de.zip
device_samsung_tuna-85b8c2381ba1907c87785a040c7dcc06e42b88de.tar.gz
device_samsung_tuna-85b8c2381ba1907c87785a040c7dcc06e42b88de.tar.bz2
Merge "Use audio_mode_t consistently"
Diffstat (limited to 'audio')
-rwxr-xr-xaudio/audio_hw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index ba5280d..5f420a4 100755
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -481,7 +481,7 @@ struct tuna_audio_device {
pthread_mutex_t lock; /* see note below on mutex acquisition order */
struct mixer *mixer;
struct mixer_ctls mixer_ctls;
- int mode;
+ audio_mode_t mode;
int devices;
struct pcm *pcm_modem_dl;
struct pcm *pcm_modem_ul;
@@ -2323,7 +2323,7 @@ static int adev_set_master_volume(struct audio_hw_device *dev, float volume)
return -ENOSYS;
}
-static int adev_set_mode(struct audio_hw_device *dev, int mode)
+static int adev_set_mode(struct audio_hw_device *dev, audio_mode_t mode)
{
struct tuna_audio_device *adev = (struct tuna_audio_device *)dev;