commit 6af6f4ef3159bb37dd0acb0a6fc5f38ecf3e770c
author Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Mon Sep 02 05:21:14 2013 +0100
committer Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Mon May 05 11:15:22 2014 +0100
tree ce108a83327b45851f03bef0e9df223d4349fbe5
parent 431c9632b6b4f0236764e245243d4480c35c4cbf

config: factor out duplicated stream open code

Change-Id: Idb72e2f38d886b7bfaf4362c5872a09ef33168cf
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>

audio_config.c

diff --git a/audio_config.c b/audio_config.c
index e26e02b..db2a6db 100644
--- a/audio_config.c
+++ b/audio_config.c
@@ -594,6 +594,20 @@
     return NULL;
 }
 
+static bool open_stream_l(struct config_mgr *cm, struct stream *s)
+{
+    if (s->ref_count < s->max_ref_count) {
+        ++s->ref_count;
+        if (s->ref_count == 1) {
+            apply_paths_to_global_l(cm, e_path_id_on, s->enable_path);
+        }
+        return true;
+    } else {
+        ALOGV("stream at maximum refcount %d", s->ref_count);
+        return false;
+    }
+}
+
 const struct hw_stream *get_stream(struct config_mgr *cm,
                                    const audio_devices_t devices,
                                    const audio_output_flags_t flags,
@@ -618,16 +632,11 @@
         ALOGV("get_stream: require type=%d; try type=%d refcount=%d refmax=%d",
                     type, s[i].info.type, s[i].ref_count, s[i].max_ref_count );
         if (s[i].info.type == type) {
-            if (s[i].ref_count < s[i].max_ref_count) {
-                ++s[i].ref_count;
-                if (s[i].ref_count == 1) {
-                    apply_paths_to_global_l(cm, e_path_id_on, s[i].enable_path);
-                }
+            if (open_stream_l(cm, &s[i])) {
                 break;
             }
         }
     }
-
     pthread_mutex_unlock(&cm->lock);
 
     if (i >= 0) {
@@ -653,13 +662,7 @@
 
     pthread_mutex_lock(&cm->lock);
     if (s != NULL) {
-        if (s->ref_count < s->max_ref_count) {
-            ++s->ref_count;
-            if (s->ref_count == 1) {
-                apply_paths_to_global_l(cm, e_path_id_on, s->enable_path);
-            }
-        } else {
-            ALOGV("stream '%s' at maximum refcount %d", name, s->ref_count);
+        if (!open_stream_l(cm, s)) {
             s = NULL;
         }
     }