commit 72c277ef4859f7aa07ac43b3b9cc6754d6e3d505
author Ravi Kumar Alamanda <ralama@codeaurora.org> Fri Feb 08 07:41:07 2013 -0800
committer Simon Wilson <simonwilson@google.com> Fri Feb 08 11:10:06 2013 -0800
tree dfd94588c6b36aeaaf13e2820529515b8fbed712
parent 7b7e91097c90adc2c1def60ba475fefba2e95e9f

Add audio_route_reset_path()

Change-Id: I24905ef23f74673e1f97b591d7dcb04a54744f05

audio_route/audio_route.c

diff --git a/audio_route/audio_route.c b/audio_route/audio_route.c
index ae6c7f7..b8eddbd 100644
--- a/audio_route/audio_route.c
+++ b/audio_route/audio_route.c
@@ -318,6 +318,33 @@
     return 0;
 }
 
+static int path_reset(struct audio_route *ar, struct mixer_path *path)
+{
+    unsigned int i;
+    unsigned int j;
+    unsigned int ctl_index;
+
+    for (i = 0; i < path->length; i++) {
+        struct mixer_ctl *ctl = path->setting[i].ctl;
+
+        /* locate the mixer ctl in the list */
+        for (ctl_index = 0; ctl_index < ar->num_mixer_ctls; ctl_index++) {
+            if (ar->mixer_state[ctl_index].ctl == ctl)
+                break;
+        }
+
+        /* reset the value(s) */
+        for (j = 0; j < ar->mixer_state[ctl_index].num_values; j++) {
+            ar->mixer_state[ctl_index].new_value[j] = ar->mixer_state[ctl_index].reset_value[j];
+            if (ar->mixer_state[ctl_index].reset_linked)
+                break;
+        }
+        ar->mixer_state[ctl_index].new_linked = ar->mixer_state[ctl_index].reset_linked;
+    }
+
+    return 0;
+}
+
 /* mixer helper function */
 static int mixer_enum_string_to_value(struct mixer_ctl *ctl, const char *string)
 {
@@ -606,6 +633,27 @@
     return 0;
 }
 
+/* Reset an audio route path by name */
+int audio_route_reset_path(struct audio_route *ar, const char *name)
+{
+    struct mixer_path *path;
+
+    if (!ar) {
+        ALOGE("invalid audio_route");
+        return -1;
+    }
+
+    path = path_get_by_name(ar, name);
+    if (!path) {
+        ALOGE("unable to find path '%s'", name);
+        return -1;
+    }
+
+    path_reset(ar, path);
+
+    return 0;
+}
+
 struct audio_route *audio_route_init(unsigned int card, const char *xml_path)
 {
     struct config_parse_state state;

audio_route/include/audio_route/audio_route.h

diff --git a/audio_route/include/audio_route/audio_route.h b/audio_route/include/audio_route/audio_route.h
index 0fea474..452b6e2 100644
--- a/audio_route/include/audio_route/audio_route.h
+++ b/audio_route/include/audio_route/audio_route.h
@@ -28,6 +28,9 @@
 /* Apply an audio route path by name */
 int audio_route_apply_path(struct audio_route *ar, const char *name);
 
+/* Reset an audio route path by name */
+int audio_route_reset_path(struct audio_route *ar, const char *name);
+
 /* Reset the audio routes back to the initial state */
 void audio_route_reset(struct audio_route *ar);