sink: Change AlsaSink kwarg 'card' to 'device'

jodal · May 18, 2015 · 4ff935d · 4ff935d
1 parent 9c9b5d4
commit 4ff935d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,16 @@
 Changelog
 *********
 
+v2.0.0b6 (UNRELEASED)
+=====================
+
+ALSA sink
+---------
+
+- Changed the :class:`spotify.AlsaSink` keyword argument ``card`` to ``device``
+  to align with pyalsaaudio 0.8.
+
+
 v2.0.0b5 (2015-05-09)
 =====================
 

diff --git a/spotify/sink.py b/spotify/sink.py
@@ -62,7 +62,7 @@ class AlsaSink(Sink):
         sudo apt-get install libasound2-dev
         pip install pyalsaaudio
 
-    The ``card`` keyword argument is passed on to :class:`alsaaudio.PCM`.
+    The ``device`` keyword argument is passed on to :class:`alsaaudio.PCM`.
     Please refer to the pyalsaaudio documentation for details.
 
     Example::
@@ -90,9 +90,9 @@ class AlsaSink(Sink):
         issue #16 <https://sourceforge.net/p/pyalsaaudio/bugs/16/>`_.
     """
 
-    def __init__(self, session, card='default'):
+    def __init__(self, session, device='default'):
         self._session = session
-        self._card = card
+        self._device_name = device
 
         import alsaaudio  # Crash early if not available
         self._alsaaudio = alsaaudio
@@ -106,7 +106,7 @@ def _on_music_delivery(self, session, audio_format, frames, num_frames):
 
         if self._device is None:
             self._device = self._alsaaudio.PCM(
-                mode=self._alsaaudio.PCM_NONBLOCK, card=self._card)
+                mode=self._alsaaudio.PCM_NONBLOCK, card=self._device_name)
             if sys.byteorder == 'little':
                 self._device.setformat(self._alsaaudio.PCM_FORMAT_S16_LE)
             else: