From 2a76d0bb2f1272c63b4ee02a985be9c2d8e0e3b7 Mon Sep 17 00:00:00 2001
From: Mike khiretskiy <mh@calculate.ru>
Date: Mon, 3 Mar 2014 10:27:06 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=BE=20=D0=B7=D0=B2=D1=83=D0=BA=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=BA=D0=B0=D1=80=D1=82=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Информация получается напрямую из /proc/asound/cards
---
 install/variables/audio.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/install/variables/audio.py b/install/variables/audio.py
index 0243ec3..5dc7a1c 100644
--- a/install/variables/audio.py
+++ b/install/variables/audio.py
@@ -33,13 +33,12 @@ class VariableOsAudioData(ReadonlyTableVariable):
               'os_audio_name']
 
     def get(self,hr=False):
-        alsaInfo = getProgPath('/usr/bin/alsa-info')
-        if not alsaInfo:
+        data = readFile('/proc/asound/cards')
+        cards = re.findall('^\s*(\d+).*\n\s+(\S.*) at .*$',data,re.M)
+        if cards:
+            return map(list, cards)
+        else:
             return [[]]
-        entry = re.compile('^Card hw:(\d+)\s*[^/]+/\'(.*?) at .*$')
-        return tuple(map(lambda x:x.groups(),
-               filter(None,map(entry.search,
-               process(alsaInfo,'--stdout',envdict=os.environ)))))
 
     setValue = Variable.setValue