commit 26d44527bde05d7e122fb59476fe993ee38918a9
author Steve Kondik <steve@cyngn.com> Wed Dec 16 15:23:47 2015 -0500
committer Steve Kondik <steve@cyngn.com> Wed Dec 16 17:42:28 2015 -0500
tree 48b64465fda0347304c25b1c3c81e9521dbfb3a9
parent faefb32f5f96f994835098abf68f889505095dc2

hal: Trivial cleanups

Change-Id: I49583e0e37665f2a2b0b196944406fc2a7ebc898

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index f155124..eca9779 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -155,6 +155,7 @@
     [USECASE_AUDIO_PLAYBACK_LOW_LATENCY] = "low-latency-playback",
     [USECASE_AUDIO_PLAYBACK_MULTI_CH] = "multi-channel-playback",
     [USECASE_AUDIO_PLAYBACK_OFFLOAD] = "compress-offload-playback",
+    [USECASE_AUDIO_PLAYBACK_ULL] = "audio-ull-playback",
 #ifdef MULTIPLE_OFFLOAD_ENABLED
     [USECASE_AUDIO_PLAYBACK_OFFLOAD2] = "compress-offload-playback2",
     [USECASE_AUDIO_PLAYBACK_OFFLOAD3] = "compress-offload-playback3",
@@ -166,7 +167,6 @@
     [USECASE_AUDIO_PLAYBACK_OFFLOAD9] = "compress-offload-playback9",
 #endif
     [USECASE_AUDIO_DIRECT_PCM_OFFLOAD] = "compress-offload-playback2",
-    [USECASE_AUDIO_PLAYBACK_ULL] = "audio-ull-playback",
     [USECASE_AUDIO_RECORD] = "audio-record",
     [USECASE_AUDIO_RECORD_COMPRESS] = "audio-record-compress",
     [USECASE_AUDIO_RECORD_LOW_LATENCY] = "low-latency-record",
@@ -2930,15 +2930,15 @@
         out->config = pcm_config_afe_proxy_playback;
         adev->voice_tx_output = out;
     } else {
-        if (out->flags & AUDIO_OUTPUT_FLAG_RAW) {
+        if (out->flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER) {
+            out->usecase = USECASE_AUDIO_PLAYBACK_DEEP_BUFFER;
+            out->config = pcm_config_deep_buffer;
+        } else if (out->flags & AUDIO_OUTPUT_FLAG_RAW) {
             out->usecase = USECASE_AUDIO_PLAYBACK_ULL;
             out->config = pcm_config_low_latency;
         } else if (out->flags & AUDIO_OUTPUT_FLAG_FAST) {
             out->usecase = USECASE_AUDIO_PLAYBACK_LOW_LATENCY;
             out->config = pcm_config_low_latency;
-        } if (out->flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER) {
-            out->usecase = USECASE_AUDIO_PLAYBACK_DEEP_BUFFER;
-            out->config = pcm_config_deep_buffer;
         } else {
             /* primary path is the default path selected if no other outputs are available/suitable */
             out->usecase = USECASE_AUDIO_PLAYBACK_PRIMARY;