commit 55a1293b422d181281cf0f7d37c6c15c5d921ef3
author Vineeta Srivastava <vsrivastava@google.com> Mon Aug 11 11:41:18 2014 -0700
committer Vineeta Srivastava <vsrivastava@google.com> Mon Aug 11 18:58:24 2014 +0000
tree 1fe49d38847c787a321281f20e8f5e987e179a0e
parent ae9a10c15cf960e9b2b1159ade6414f80689db5f

Revert "audio: add support for routing to/from voice TX/RX paths"

This reverts commit 8edfd66a7b1d033e65e5621d25ef3cbf1f40316e.

Bug: 16949514

hal/voice.c

diff --git a/hal/voice.c b/hal/voice.c
index 4b72df3..ecc607d 100644
--- a/hal/voice.c
+++ b/hal/voice.c
@@ -97,7 +97,7 @@
     return ret;
 }
 
-int start_call(struct audio_device *adev, audio_usecase_t usecase_id, struct stream_out *out)
+int start_call(struct audio_device *adev, audio_usecase_t usecase_id)
 {
     int i, ret = 0;
     struct audio_usecase *uc_info;
@@ -112,8 +112,8 @@
     uc_info = (struct audio_usecase *)calloc(1, sizeof(struct audio_usecase));
     uc_info->id = usecase_id;
     uc_info->type = VOICE_CALL;
-    uc_info->stream.out = out;
-    uc_info->devices = out->devices;
+    uc_info->stream.out = adev->primary_output;
+    uc_info->devices = adev->primary_output->devices;
     uc_info->in_snd_device = SND_DEVICE_NONE;
     uc_info->out_snd_device = SND_DEVICE_NONE;
 
@@ -327,13 +327,13 @@
     return err;
 }
 
-int voice_start_call(struct audio_device *adev, struct stream_out *out)
+int voice_start_call(struct audio_device *adev)
 {
     int ret = 0;
 
     ret = voice_extn_start_call(adev);
     if (ret == -ENOSYS) {
-        ret = start_call(adev, USECASE_VOICE_CALL, out);
+        ret = start_call(adev, USECASE_VOICE_CALL);
     }
 
     return ret;