[SCM] volti/master: Avoid crashes with 'odd' audio configurations (i.e. cards with no mixer controls).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 60f6f252368752f2ef45768d144ca0d7b6aefbd3
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Aug 30 15:28:13 2012 +0200

    Avoid crashes with 'odd' audio configurations (i.e. cards with no mixer controls).

diff --git a/debian/patches/0001-cards_without_mixer.patch b/debian/patches/0001-cards_without_mixer.patch
index 0fa05d4..05b5cfb 100644
--- a/debian/patches/0001-cards_without_mixer.patch
+++ b/debian/patches/0001-cards_without_mixer.patch
@@ -1,14 +1,25 @@
 Description: Fix crash when the audio card has no mixers.
+ Debian bugs:
+  - http://bugs.debian.org/673858
+  - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684363
 Origin: upstream
 Bug: https://code.google.com/p/volti/issues/detail?id=27
-Bug-Debian: http://bugs.debian.org/673858
 ---
- src/alsactrl.py |    7 ++++++-
+ src/alsactrl.py |    9 +++++++--
  src/mixer.py    |    7 ++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
+ 2 files changed, 13 insertions(+), 3 deletions(-)
 
 --- volti.orig/src/alsactrl.py
 +++ volti/src/alsactrl.py
+@@ -45,7 +45,7 @@ class AlsaControl():
+                 self.reopen(self.card_index, control)
+                 self._check_version()
+             except Exception, err:
+-                log.Error("can't open first available control for card %s\nerror: %s" % (
++                log.Warn("can't open first available control for card %s\nerror: %s" % (
+                     self.get_card_name(), str(err)))
+ 
+     def __del__(self):
 @@ -189,7 +189,12 @@ class AlsaControl():
      def get_mixers(self, card_index=0):
          """ Returns mixers list """

-- 
volti packaging