commit daa827d53a1ee952188b90c0dc8ea51bc87cb27d
author Nick Kralevich <nnk@google.com> Wed Dec 18 05:54:14 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 18 05:54:14 2013 +0000
tree 972db3334cf67693c08691565593eabbdfc0b468
parent defe30caceea40c6ef2bb864bef7d4fb6254f348
parent 48177a7b470da78543b66a618cfbf0c43a41fd74

am 48177a7b: am 7bc597c3: Merge "Visualizer: do not use GNU old-style field designators"

* commit '48177a7b470da78543b66a618cfbf0c43a41fd74':
  Visualizer: do not use GNU old-style field designators

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 48c426d..972837b 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2356,7 +2356,6 @@
     adev->mode = AUDIO_MODE_NORMAL;
     adev->active_input = NULL;
     adev->primary_output = NULL;
-    adev->out_device = AUDIO_DEVICE_NONE;
     adev->voice_call_rx = NULL;
     adev->voice_call_tx = NULL;
     adev->voice_volume = 1.0f;

hal/audio_hw.h

diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index 0da4324..e2d6ff7 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -173,7 +173,6 @@
     pthread_mutex_t lock; /* see note below on mutex acquisition order */
     struct mixer *mixer;
     audio_mode_t mode;
-    audio_devices_t out_device;
     struct stream_in *active_input;
     struct stream_out *primary_output;
     int in_call;