commit 395b7df9b076d5ad64c0263238582ed9e20a38ca
author qctecmdr <qctecmdr@localhost> Fri Mar 13 07:10:38 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 13 07:10:38 2020 -0700
tree 091ebc3c1066edef5032e19e5bd8fe7ce9b80923
parent 74e7101944adcfab4d9db04b859bc214786e1c2c
parent df4dc4ac23e0a21b9d84ae316e9b827c26af6c19

Merge "visualizer: dynamically parse the sound card when opening mixer"

visualizer/offload_visualizer.c

diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index e1a34a0..65b5938 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -192,11 +192,6 @@
 
 #define DSP_OUTPUT_LATENCY_MS 0 /* Fudge factor for latency after capture point in audio DSP */
 
-/* Retry for delay for mixer open */
-#define RETRY_NUMBER 10
-#define RETRY_US 500000
-
-#define MIXER_CARD 0
 #define SOUND_CARD 0
 
 #ifndef CAPTURE_DEVICE
@@ -471,12 +466,12 @@
 
     pthread_mutex_lock(&lock);
 
-    mixer = mixer_open(MIXER_CARD);
-    while (mixer == NULL && retry_num < RETRY_NUMBER) {
-        usleep(RETRY_US);
-        mixer = mixer_open(MIXER_CARD);
-        retry_num++;
-    }
+    sound_card =
+        parse_pcm_device("AFE-PROXY TX", SND_CARD_NUM);
+    sound_card =
+        (sound_card == -1)? SOUND_CARD : sound_card;
+
+    mixer = mixer_open(sound_card);
     if (mixer == NULL) {
         pthread_mutex_unlock(&lock);
         return NULL;
@@ -490,10 +485,6 @@
             if (!capture_enabled) {
                 ret = configure_proxy_capture(mixer, 1);
                 if (ret == 0) {
-                    sound_card =
-                       parse_pcm_device("AFE-PROXY TX", SND_CARD_NUM);
-                    sound_card =
-                       (sound_card == -1)? SOUND_CARD : sound_card;
                     capture_device =
                        parse_pcm_device("AFE-PROXY TX", DEVICE_ID);
                     capture_device =