Notes about remotising devices

[gregoa/zavai.git] / zavai / audio.py

diff --git a/zavai/audio.py b/zavai/audio.py
index 15255fcba6ed05f840461a9f75c17a26b2c76739..9d7835e89488405e7dd3acd59bfae9ae90602700 100755 (executable)
--- a/zavai/audio.py
+++ b/zavai/audio.py
@@ -170,31 +170,39 @@ class Audio(zavai.Service):
 #            ["arecord", "-D", "hw", "-f", "cd", "-r", "8000", "-t", "wav", "-V", "stereo", "/dev/null"])
 
     def save_scenario(self, name):
-        res = subprocess.call(["alsactl", "store", "-f", name])
-        if res != 0:
-            raise RuntimeError("Saving audio scenario to '%s' failed" % name)
+        while True:
+                res = subprocess.call(["alsactl", "store", "-f", name])
+                if res == 0: return
+                if res > 0:
+                    raise RuntimeError("Saving audio scenario to '%s' failed" % name)
 
     def load_scenario(self, name):
-        res = subprocess.call(["alsactl", "restore", "-f", name])
-        if res != 0:
-            raise RuntimeError("Loading audio scenario '%s' failed with error %d" % (name, res))
+        while True:
+                res = subprocess.call(["alsactl", "restore", "-f", name])
+                if res == 0: return
+                if res > 0:
+                    raise RuntimeError("Loading audio scenario '%s' failed with error %d" % (name, res))
 
     def mixer_set(self, name, *args):
         args = map(str, args)
-        res = subprocess.call(["amixer", "-q", "set", name] + args)
-        if res != 0:
-            raise RuntimeError("Setting mixer '%s' to %s failed with error %d" % (name, " ".join(args), res))
+        while True:
+                res = subprocess.call(["amixer", "-q", "set", name] + args)
+                if res == 0: return
+                if res > 0:
+                    raise RuntimeError("Setting mixer '%s' to %s failed with error %d" % (name, " ".join(args), res))
 
     def mixer_set_many(self, *args):
         """Perform many mixer set operations via amixer --stdin"""
-        proc = subprocess.Popen(["amixer", "-q", "--stdin"], stdin=subprocess.PIPE)
         cmd_input = []
         for k, v in args:
             cmd_input.append("sset " + repr(k) + " " + repr(v))
-        (out, err) = proc.communicate(input="\n".join(cmd_input))
-        res = proc.wait()
-        if res != 0:
-            raise RuntimeError("Setting mixer failed with error %d" % res)
+        while True:
+                proc = subprocess.Popen(["amixer", "-q", "--stdin"], stdin=subprocess.PIPE)
+                (out, err) = proc.communicate(input="\n".join(cmd_input))
+                res = proc.wait()
+                if res == 0: return
+                if res > 0:
+                    raise RuntimeError("Setting mixer failed with error %d" % res)
 
 
 #class Hub: