Merge tag '0.10.0'

the tag was erroneously "orphaned".

fixes #140.

Conflicts:
	CHANGES.md

CHANGES.md

@@ -1,17 +1,6 @@
-# Version 0.11.0
+# Version 0.10.1
-- Fixed `Mixer.getvolume()` returning outdated value (#126)
+- restore previous xrun behaviour, #131
-- Fixed PCM crashing with some sample formats due to buffer size
+- type hints
-  miscalculation
-- Fixed `PCM.read()` ignoring overruns (regression in 0.10.0)
-- Reverted to `PCM.write()` not throwing an exception on playback buffer
-  underrun; instead, return -EPIPE like `PCM.read()` does on overrun (#130)
-- Added `PCM.avail()` and `PCM.polldescriptors_revents()` functions
-- Added `nominal_bits` and `physical_bits` entries to `PCM.info()`'s
-  return value
-- Added Python type hint file, and adjusted documentation accordingly (#58)
-- Improvements to the examples, in particular isine.py (#42)
-
-Contributions by @ossilator and @viinikv.
 
 # Version 0.10.0
 - assorted improvements (#123 from @ossilator)

MANIFEST.in

@@ -1,5 +1,4 @@
 include *.py
-include *.pyi
 include CHANGES
 include TODO
 include LICENSE

alsaaudio.c

@@ -403,7 +403,7 @@ static int alsapcm_setup(alsapcm_t *self)
 	snd_pcm_hw_params_get_period_size(hwparams, &self->periodsize, &dir);
 	snd_pcm_hw_params_get_periods(hwparams, &self->periods, &dir);
 
-	self->framesize = self->channels * snd_pcm_format_physical_width(self->format)/8;
+	self->framesize = self->channels * snd_pcm_hw_params_get_sbits(hwparams)/8;
 
 	return res;
 }
@@ -598,12 +598,6 @@ alsapcm_dumpinfo(alsapcm_t *self, PyObject *args)
 	val = snd_pcm_hw_params_get_sbits(hwparams);
 	printf("significant bits = %d\n", val);
 
-	val = snd_pcm_format_width(self->format);
-	printf("nominal bits = %d\n", val);
-
-	val = snd_pcm_format_physical_width(self->format);
-	printf("physical bits = %d\n", val);
-
 	val = snd_pcm_hw_params_is_batch(hwparams);
 	printf("is batch = %d\n", val);
 
@@ -784,16 +778,6 @@ alsapcm_info(alsapcm_t *self, PyObject *args)
 	PyDict_SetItemString(info,"significant_bits", value);
 	Py_DECREF(value);
 
-	val = snd_pcm_format_width(self->format);
-	value=PyLong_FromUnsignedLong((unsigned long) val);
-	PyDict_SetItemString(info,"nominal_bits", value);
-	Py_DECREF(value);
-
-	val = snd_pcm_format_physical_width(self->format);
-	value=PyLong_FromUnsignedLong((unsigned long) val);
-	PyDict_SetItemString(info,"physical_bits", value);
-	Py_DECREF(value);
-
 	val = snd_pcm_hw_params_is_batch(hwparams);
 	value=PyBool_FromLong((unsigned long) val);
 	PyDict_SetItemString(info,"is_batch", value);
@@ -1170,37 +1154,6 @@ alsapcm_getchannels(alsapcm_t *self,PyObject *args)
 	return out;
 }
 
-static PyObject *
-alsapcm_setchannels(alsapcm_t *self, PyObject *args)
-{
-	int channels, saved;
-	int res;
-
-	if (!PyArg_ParseTuple(args,"i:setchannels", &channels))
-		return NULL;
-
-	if (!self->handle) {
-		PyErr_SetString(ALSAAudioError, "PCM device is closed");
-		return NULL;
-	}
-
-	PyErr_WarnEx(PyExc_DeprecationWarning,
-				 "This function is deprecated. "
-				 "Please use the named parameter `channels` to `PCM()` instead", 1);
-
-	saved = self->channels;
-	self->channels = channels;
-	res = alsapcm_setup(self);
-	if (res < 0)
-	{
-		self->channels = saved;
-		PyErr_Format(ALSAAudioError, "%s [%s]", snd_strerror(res),
-					 self->cardname);
-		return NULL;
-	}
-	return PyLong_FromLong(self->channels);
-}
-
 static PyObject *
 alsapcm_pcmtype(alsapcm_t *self, PyObject *args)
 {
@@ -1243,6 +1196,37 @@ alsapcm_cardname(alsapcm_t *self, PyObject *args)
 	return PyUnicode_FromString(self->cardname);
 }
 
+static PyObject *
+alsapcm_setchannels(alsapcm_t *self, PyObject *args)
+{
+	int channels, saved;
+	int res;
+
+	if (!PyArg_ParseTuple(args,"i:setchannels", &channels))
+		return NULL;
+
+	if (!self->handle) {
+		PyErr_SetString(ALSAAudioError, "PCM device is closed");
+		return NULL;
+	}
+
+	PyErr_WarnEx(PyExc_DeprecationWarning,
+				 "This function is deprecated. "
+				 "Please use the named parameter `channels` to `PCM()` instead", 1);
+
+	saved = self->channels;
+	self->channels = channels;
+	res = alsapcm_setup(self);
+	if (res < 0)
+	{
+		self->channels = saved;
+		PyErr_Format(ALSAAudioError, "%s [%s]", snd_strerror(res),
+					 self->cardname);
+		return NULL;
+	}
+	return PyLong_FromLong(self->channels);
+}
+
 static PyObject *
 alsapcm_setrate(alsapcm_t *self, PyObject *args)
 {
@@ -1380,23 +1364,12 @@ alsapcm_read(alsapcm_t *self, PyObject *args)
 	buffer = PyBytes_AS_STRING(buffer_obj);
 #endif
 
-	// After drop() and drain(), we need to prepare the stream again.
-	// Note that fresh streams are already prepared by snd_pcm_hw_params().
 	state = snd_pcm_state(self->handle);
-	if ((state != SND_PCM_STATE_SETUP) ||
+	if ((state != SND_PCM_STATE_XRUN && state != SND_PCM_STATE_SETUP) ||
-		!(res = snd_pcm_prepare(self->handle))) {
+		(res = snd_pcm_prepare(self->handle)) >= 0) {
-
 		Py_BEGIN_ALLOW_THREADS
 		res = snd_pcm_readi(self->handle, buffer, self->periodsize);
 		Py_END_ALLOW_THREADS
-
-		if (res == -EPIPE) {
-			// This means buffer overrun, which we need to report.
-			// However, we recover the stream, so the next PCM.read() will work
-			// again. If recovery fails (very unlikely), report that instead.
-			if (!(res = snd_pcm_prepare(self->handle)))
-				res = -EPIPE;
-		}
 	}
 
 	if (res != -EPIPE)
@@ -1412,10 +1385,10 @@ alsapcm_read(alsapcm_t *self, PyObject *args)
 			Py_DECREF(buffer_obj);
 			return NULL;
 		}
-		else
-		{
-			sizeout = res * self->framesize;
 	}
+
+	if (res > 0 ) {
+		sizeout = res * self->framesize;
 	}
 
 	if (size != sizeout) {
@@ -1452,6 +1425,7 @@ static PyObject *alsapcm_write(alsapcm_t *self, PyObject *args)
 {
 	int datalen;
 	char *data;
+	PyObject *rc = NULL;
 
 #if PY_MAJOR_VERSION < 3
 	if (!PyArg_ParseTuple(args,"s#:write", &data, &datalen))
@@ -1489,32 +1463,30 @@ static PyObject *alsapcm_write(alsapcm_t *self, PyObject *args)
 	}
 
 	int res;
-	// After drop() and drain(), we need to prepare the stream again.
-	// Note that fresh streams are already prepared by snd_pcm_hw_params().
 	snd_pcm_state_t state = snd_pcm_state(self->handle);
-	if ((state != SND_PCM_STATE_SETUP) ||
+
-		!(res = snd_pcm_prepare(self->handle))) {
+
+	if ((state != SND_PCM_STATE_XRUN && state != SND_PCM_STATE_SETUP) ||
+		(res = snd_pcm_prepare(self->handle)) >= 0) {
 
 		Py_BEGIN_ALLOW_THREADS
 		res = snd_pcm_writei(self->handle, data, datalen/self->framesize);
-		Py_END_ALLOW_THREADS
-
 		if (res == -EPIPE) {
-			// This means buffer underrun, which we need to report.
+			/* EPIPE means underrun */
-			// However, we recover the stream, so the next PCM.write() will work
+			res = snd_pcm_recover(self->handle, res, 1);
-			// again. If recovery fails (very unlikely), report that instead.
+			if (res >= 0) {
-			if (!(res = snd_pcm_prepare(self->handle)))
+				res = snd_pcm_writei(self->handle, data, datalen/self->framesize);
-				res = -EPIPE;
 			}
 		}
+		Py_END_ALLOW_THREADS
+	}
 
-	if (res != -EPIPE)
+	if (res == -EAGAIN) {
-	{
+		rc = PyLong_FromLong(0);
-		if (res == -EAGAIN)
-		{
-			res = 0;
 	}
-		else if (res < 0) {
+	res = snd_pcm_prepare(self->handle);
+	if (res < 0)
+	{
 		PyErr_Format(ALSAAudioError, "%s [%s]", snd_strerror(res),
 					 self->cardname);
 
@@ -1524,13 +1496,12 @@ static PyObject *alsapcm_write(alsapcm_t *self, PyObject *args)
 
 		return NULL;
 	}
-	}
 
 #if PY_MAJOR_VERSION >= 3
 	PyBuffer_Release(&buf);
 #endif
 
-	return PyLong_FromLong(res);
+	return rc;
 }
 
 static PyObject *
@@ -1750,7 +1721,6 @@ static PyMethodDef alsapcm_methods[] = {
 	{"pcmtype", (PyCFunction)alsapcm_pcmtype, METH_VARARGS},
 	{"pcmmode", (PyCFunction)alsapcm_pcmmode, METH_VARARGS},
 	{"cardname", (PyCFunction)alsapcm_cardname, METH_VARARGS},
-	{"getchannels", (PyCFunction)alsapcm_getchannels, METH_VARARGS},
 	{"setchannels", (PyCFunction)alsapcm_setchannels, METH_VARARGS},
 	{"setrate", (PyCFunction)alsapcm_setrate, METH_VARARGS},
 	{"setformat", (PyCFunction)alsapcm_setformat, METH_VARARGS},
@@ -1766,6 +1736,7 @@ static PyMethodDef alsapcm_methods[] = {
 	{"getformats", (PyCFunction)alsapcm_getformats, METH_VARARGS},
 	{"getratebounds", (PyCFunction)alsapcm_getratemaxmin, METH_VARARGS},
 	{"getrates", (PyCFunction)alsapcm_getrates, METH_VARARGS},
+	{"getchannels", (PyCFunction)alsapcm_getchannels, METH_VARARGS},
 	{"read", (PyCFunction)alsapcm_read, METH_VARARGS},
 	{"write", (PyCFunction)alsapcm_write, METH_VARARGS},
 	{"avail", (PyCFunction)alsapcm_avail, METH_VARARGS},

alsaaudio.pyi

@@ -1,135 +0,0 @@
-from typing import list
-
-PCM_PLAYBACK: int
-PCM_CAPTURE: int
-
-PCM_NORMAL: int
-PCM_NONBLOCK: int
-PCM_ASYNC: int
-
-PCM_FORMAT_S8: int
-PCM_FORMAT_U8: int
-PCM_FORMAT_S16_LE: int
-PCM_FORMAT_S16_BE: int
-PCM_FORMAT_U16_LE: int
-PCM_FORMAT_U16_BE: int
-PCM_FORMAT_S24_LE: int
-PCM_FORMAT_S24_BE: int
-PCM_FORMAT_U24_LE: int
-PCM_FORMAT_U24_BE: int
-PCM_FORMAT_S32_LE: int
-PCM_FORMAT_S32_BE: int
-PCM_FORMAT_U32_LE: int
-PCM_FORMAT_U32_BE: int
-PCM_FORMAT_FLOAT_LE: int
-PCM_FORMAT_FLOAT_BE: int
-PCM_FORMAT_FLOAT64_LE: int
-PCM_FORMAT_FLOAT64_BE: int
-PCM_FORMAT_MU_LAW: int
-PCM_FORMAT_A_LAW: int
-PCM_FORMAT_IMA_ADPCM: int
-PCM_FORMAT_MPEG: int
-PCM_FORMAT_GSM: int
-PCM_FORMAT_S24_3LE: int
-PCM_FORMAT_S24_3BE: int
-PCM_FORMAT_U24_3LE: int
-PCM_FORMAT_U24_3BE: int
-
-PCM_TSTAMP_NONE: int
-PCM_TSTAMP_ENABLE: int
-
-PCM_TSTAMP_TYPE_GETTIMEOFDAY: int
-PCM_TSTAMP_TYPE_MONOTONIC: int
-PCM_TSTAMP_TYPE_MONOTONIC_RAW: int
-
-PCM_FORMAT_DSD_U8: int
-PCM_FORMAT_DSD_U16_LE: int
-PCM_FORMAT_DSD_U32_LE: int
-PCM_FORMAT_DSD_U32_BE: int
-
-PCM_STATE_OPEN: int
-PCM_STATE_SETUP: int
-PCM_STATE_PREPARED: int
-PCM_STATE_RUNNING: int
-PCM_STATE_XRUN: int
-PCM_STATE_DRAINING: int
-PCM_STATE_PAUSED: int
-PCM_STATE_SUSPENDED: int
-PCM_STATE_DISCONNECTED: int
-
-MIXER_CHANNEL_ALL: int
-
-MIXER_SCHN_UNKNOWN: int
-MIXER_SCHN_FRONT_LEFT: int
-MIXER_SCHN_FRONT_RIGHT: int
-MIXER_SCHN_REAR_LEFT: int
-MIXER_SCHN_REAR_RIGHT: int
-MIXER_SCHN_FRONT_CENTER: int
-MIXER_SCHN_WOOFER: int
-MIXER_SCHN_SIDE_LEFT: int
-MIXER_SCHN_SIDE_RIGHT: int
-MIXER_SCHN_REAR_CENTER: int
-MIXER_SCHN_MONO: int
-
-VOLUME_UNITS_PERCENTAGE: int
-VOLUME_UNITS_RAW: int
-VOLUME_UNITS_DB: int
-
-def pcms(pcmtype: int) -> list[str]: ...
-def cards() -> list[str]: ...
-def mixers(cardindex: int = -1, device: str = 'default') -> list[str]: ...
-def asoundlib_version() -> str: ...
-
-class PCM:
-	def __init__(type: int = PCM_PLAYBACK, mode: int = PCM_NORMAL, rate: int = 44100, channels: int = 2,
-		format: int = PCM_FORMAT_S16_LE, periodsize: int = 32, periods: int = 4,
-		device: str = 'default', cardindex: int = -1) -> PCM: ...
-	def close() -> None: ...
-	def dumpinfo() -> None: ...
-	def info() -> dict: ...
-	def state() -> int: ...
-	def htimestamp() -> tuple[int, int, int]: ...
-	def set_tstamp_mode(mode: int = PCM_TSTAMP_ENABLE) -> None: ...
-	def get_tstamp_mode() -> int: ...
-	def set_tstamp_type(type: int = PCM_TSTAMP_TYPE_GETTIMEOFDAY) -> None: ...
-	def get_tstamp_type() -> int: ...
-	def getformats() -> dict: ...
-	def getratebounds() -> tuple[int, int]: ...
-	def getrates() -> int | tuple[int, int] | list[int]: ...
-	def getchannels() -> list[int]: ...
-	def setchannels(nchannels: int) -> None: ...
-	def pcmtype() -> int: ...
-	def pcmmode() -> int: ...
-	def cardname() -> str: ...
-	def setrate(rate: int) -> None: ...
-	def setformat(format: int) -> int: ...
-	def setperiodsize(period: int) -> int: ...
-	def read() -> tuple[int, bytes]: ...
-	def write(data: bytes) -> int: ...
-	def avail() -> int: ...
-	def pause(enable: bool = True) -> int: ...
-	def drop() -> int: ...
-	def drain() -> int: ...
-	def polldescriptors() -> list[tuple[int, int]]: ...
-	def polldescriptors_revents(descriptors: list[tuple[int, int]]) -> int: ...
-
-class Mixer:
-	def __init__(control: str = 'Master', id: int = 0, cardindex: int = -1, device: str = 'default') -> Mixer: ...
-	def cardname() -> str: ...
-	def close() -> None: ...
-	def mixer() -> str: ...
-	def mixerid() -> int: ...
-	def switchcap() -> int: ...
-	def volumecap() -> int: ...
-	def getvolume(pcmtype: int = PCM_PLAYBACK, units: int = VOLUME_UNITS_PERCENTAGE) -> int: ...
-	def getrange(pcmtype: int = PCM_PLAYBACK, units: int = VOLUME_UNITS_RAW) -> tuple[int, int]: ...
-	def getenum() -> tuple[str, list[str]]: ...
-	def getmute() -> list[int]: ...
-	def getrec() -> list[int]: ...
-	def setvolume(volume: int, pcmtype: int = PCM_PLAYBACK, units: int = VOLUME_UNITS_PERCENTAGE, channel: (int | None) = None) -> None: ...
-	def setenum(index: int) -> None: ...
-	def setmute(mute: bool, channel: (int | None) = None) -> None: ...
-	def setrec(capture: int, channel: (int | None) = None) -> None: ...
-	def polldescriptors() -> list[tuple[int, int]]: ...
-	def handleevents() -> int: ...
-

doc/conf.py

@@ -67,7 +67,7 @@ release = version
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = 'en'
+language = None
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

doc/libalsaaudio.rst

@@ -10,7 +10,7 @@
 
 The :mod:`alsaaudio` module defines functions and classes for using ALSA.
 
-.. function:: pcms(pcmtype: int = PCM_PLAYBACK) ->list[str]
+.. function:: pcms(pcmtype=PCM_PLAYBACK)
 
    List available PCM devices by name.
 
@@ -34,7 +34,7 @@ The :mod:`alsaaudio` module defines functions and classes for using ALSA.
 
    *New in 0.8*
 
-.. function:: cards() -> list[str]
+.. function:: cards()
 
    List the available ALSA cards by name. This function is only moderately
    useful. If you want to see a list of available PCM devices, use :func:`pcms`
@@ -46,7 +46,7 @@ The :mod:`alsaaudio` module defines functions and classes for using ALSA.
    .. function:: card_indexes()
    .. function:: card_name()
 
-.. function:: mixers(cardindex: int = -1, device: str = 'default') -> list[str]
+.. function:: mixers(cardindex=-1, device='default')
 
    List the available mixers. The arguments are:
 
@@ -82,7 +82,7 @@ The :mod:`alsaaudio` module defines functions and classes for using ALSA.
      changed. Since 0.8, this functions returns the mixers for the default
      device, not the mixers for the first card.
 
-.. function:: asoundlib_version() -> str
+.. function:: asoundlib_version()
 
    Return a Python string containing the ALSA version found.
 
@@ -96,12 +96,10 @@ PCM objects in :mod:`alsaaudio` can play or capture (record) PCM
 sound through speakers or a microphone. The PCM constructor takes the
 following arguments:
 
-.. class:: PCM(type: int = PCM_PLAYBACK, mode: int = PCM_NORMAL, rate: int = 44100, channels: int = 2,
+.. class:: PCM(type=PCM_PLAYBACK, mode=PCM_NORMAL, rate=44100, channels=2, format=PCM_FORMAT_S16_LE, periodsize=32, periods=4, device='default', cardindex=-1)
-               format: int = PCM_FORMAT_S16_LE, periodsize: int = 32, periods: int = 4,
-               device: str = 'default', cardindex: int = -1) -> PCM
 
-   This class is used to represent a PCM device (either for playback or
+   This class is used to represent a PCM device (either for playback and
-   recording). The constructor's arguments are:
+   recording). The arguments are:
 
    * *type* - can be either :const:`PCM_CAPTURE` or :const:`PCM_PLAYBACK`
      (default).  
@@ -159,15 +157,7 @@ following arguments:
 
      **Note:** This should not be used, as it bypasses most of ALSA's configuration.
 
-   The defaults mentioned above are values passed by :mod:alsaaudio
+   This will construct a PCM object with the given settings.
-   to ALSA, not anything internal to ALSA.
-
-   **Note:** For default and non-default values alike, there is no
-   guarantee that a PCM device supports the requested configuration,
-   and ALSA may pick realizable values which it believes to be closest
-   to the request. Therefore, after creating a PCM object, it is
-   necessary to verify whether its realized configuration is acceptable.
-   The :func:info method can be used to query it.
 
    *Changed in 0.10:*
 
@@ -189,27 +179,13 @@ following arguments:
 
 PCM objects have the following methods:
 
-.. method:: PCM.info() -> dict
+.. method:: PCM.info()
 
-   Returns a dictionary containing the configuration of a PCM device.
+   The info function returns a dictionary containing the configuration of a PCM device. As ALSA takes into account limitations of the hardware and software devices the configuration achieved might not correspond to the values used during creation. There is therefore a need to check the realised configuration before processing the sound coming from the device or before sending sound to a device. A small subset of parameters can be set, but cannot be queried. These parameters are stored by alsaaudio and returned as they were given by the user, to distinguish them from parameters retrieved from ALSA these parameters have a name prefixed with **" (call value) "**. Yet another set of properties derives directly from the hardware and can be obtained through ALSA.
    
-   A small subset of properties reflects fixed parameters given by the
+   ===========================  =============================  ==================================================================
-   user, stored within alsaaudio. To distinguish them from properties
-   retrieved from ALSA when the call is made, they have their name
-   prefixed with **" (call value) "**.
-
-   Descriptions of properties which can be directly set during PCM object
-   instantiation carry the prefix "PCM():", followed by the respective
-   constructor parameter. Note that due to device limitations, the values
-   may deviate from those originally requested.
-
-   Yet another set of properties cannot be set, and derives directly from
-   the hardware, possibly depending on other properties. Those properties'
-   descriptions are prefixed with "hw:" below.
-
-   ===========================  ====================================  ==================================================================
         Key                      Description (Reference)            Type       
-   ===========================  ====================================  ==================================================================
+   ===========================  =============================  ==================================================================
    name                         PCM():device                      string
    card_no                      *index of card*                   integer  (negative indicates device not associable with a card)
    device_no                    *index of PCM device*             integer 
@@ -233,9 +209,7 @@ PCM objects have the following methods:
    buffer_size                  *buffer size*                     integer (frames) (negative indicates error)
    get_periods                  *approx. periods in buffer*       integer (negative indicates error)
    rate_numden                  *numerator, denominator*          tuple (integer (Hz), integer (Hz))
-   significant_bits             *significant bits in sample* [#tss]_  integer (negative indicates error)
+   significant_bits             *significant bits in sample*      integer (negative indicates error)
-   nominal_bits                 *nominal bits in sample* [#tss]_      integer (negative indicates error)
-   physical_bits                *sample width in bits* [#tss]_        integer (negative indicates error)
    is_batch                     *hw: double buffering*            boolean (True: hardware supported)
    is_block_transfer            *hw: block transfer*              boolean (True: hardware supported)
    is_double                    *hw: double buffering*            boolean (True: hardware supported)
@@ -246,32 +220,22 @@ PCM objects have the following methods:
    can_pause                    *hw: pause*                       boolean (True: hardware supported)
    can_resume                   *hw: resume*                      boolean (True: hardware supported)
    can_sync_start               *hw: synchronized start*          boolean (True: hardware supported) 
-   ===========================  ====================================  ==================================================================
+   ===========================  =============================  ==================================================================
-.. [#tss] More information in the :ref:`terminology section for sample size <term-sample-size>`
 
-..
+   The italicized descriptions give a summary of the "full" description as it can be found in the  `ALSA documentation <https://www.alsa-project.org/alsa-doc>`_. "hw:": indicates that the property indicated relates to the hardware. Parameters passed to the PCM object during instantation are prefixed with "PCM():", they are described there for the keyword argument indicated after "PCM():".
 
-   The italicized descriptions give a summary of the "full" description
-   as can be found in the
-   `ALSA documentation <https://www.alsa-project.org/alsa-doc>`_.
 
-   *New in 0.9.1*
+.. method:: PCM.pcmtype()
-
-.. method:: PCM.dumpinfo()
-
-   Dumps the PCM object's configured parameters to stdout.
-
-.. method:: PCM.pcmtype() -> int
 
    Returns the type of PCM object. Either :const:`PCM_CAPTURE` or
    :const:`PCM_PLAYBACK`.
 
-.. method:: PCM.pcmmode() -> int
+.. method:: PCM.pcmmode()
 
    Return the mode of the PCM object. One of :const:`PCM_NONBLOCK`,
    :const:`PCM_ASYNC`, or :const:`PCM_NORMAL`
 
-.. method:: PCM.cardname() -> string
+.. method:: PCM.cardname()
 
    Return the name of the sound card used by this PCM object.
 
@@ -303,23 +267,37 @@ PCM objects have the following methods:
    Returns a dictionary of supported format codes (integers) keyed by
    their standard ALSA names (strings).
 
-.. method:: PCM.setchannels(nchannels: int) -> int
+.. method:: PCM.setchannels(nchannels)
 
    .. deprecated:: 0.9 Use the `channels` named argument to :func:`PCM`.
 
-.. method:: PCM.setrate(rate: int) -> int
+.. method:: PCM.setrate(rate)
 
    .. deprecated:: 0.9 Use the `rate` named argument to :func:`PCM`.
 
-.. method:: PCM.setformat(format: int) -> int
+.. method:: PCM.setformat(format)
 
    .. deprecated:: 0.9 Use the `format` named argument to :func:`PCM`.
 
-.. method:: PCM.setperiodsize(period: int) -> int
+.. method:: PCM.setperiodsize(period)
 
    .. deprecated:: 0.9 Use the `periodsize` named argument to :func:`PCM`.
 
-.. method:: PCM.state() -> int
+.. method:: PCM.info()
+
+   Returns a dictionary with the PCM object's configured parameters.
+
+   Values are retrieved from the ALSA library if they are available;
+   otherwise they represent those stored by pyalsaaudio, and their keys
+   are prefixed with ' (call value) '.
+
+   *New in 0.9.1*
+
+.. method:: PCM.dumpinfo()
+
+   Dumps the PCM object's configured parameters to stdout.
+
+.. method:: PCM.state()
 
    Returs the current state of the stream, which can be one of
    :const:`PCM_STATE_OPEN` (this should not actually happen),
@@ -334,21 +312,7 @@ PCM objects have the following methods:
 
    *New in 0.10*
 
-.. method:: PCM.avail() -> int
+.. method:: PCM.read()
-
-   For :const:`PCM_PLAYBACK` PCM objects, returns the number of writable
-   (that is, free) frames in the buffer.
-
-   For :const:`PCM_CAPTURE` PCM objects, returns the number of readable
-   (that is, filled) frames in the buffer.
-
-   An attempt to read/write more frames than indicated will block (in
-   :const:`PCM_NORMAL` mode) or fail and return zero (in
-   :const:`PCM_NONBLOCK` mode).
-
-   *New in 0.11*
-
-.. method:: PCM.read() -> tuple[int, bytes]
 
    In :const:`PCM_NORMAL` mode, this function blocks until a full period is
    available, and then returns a tuple (length,data) where *length* is
@@ -360,54 +324,42 @@ PCM objects have the following methods:
    ``(0,'')`` if no new period has become available since the last
    call to read.
 
-   In case of a buffer overrun, this function will return the negative
+   In case of an overrun, this function will return a negative size: :const:`-EPIPE`.
-   size :const:`-EPIPE`, and no data is read.
+   This indicates that data was lost, even if the operation itself succeeded.
-   This indicates that data was lost. To resume capturing, just call read
+   Try using a larger periodsize.
-   again, but note that the stream was already corrupted.
-   To avoid the problem in the future, try using a larger period size
-   and/or more periods, at the cost of higher latency.
 
-.. method:: PCM.write(data: bytes) -> int
+.. method:: PCM.write(data)
 
    Writes (plays) the sound in data. The length of data *must* be a
    multiple of the frame size, and *should* be exactly the size of a
    period. If less than 'period size' frames are provided, the actual
    playout will not happen until more data is written.
 
-   If the data was successfully written, the call returns the size of the
+   If the device is not in :const:`PCM_NONBLOCK` mode, this call will block if
-   data *in frames*.
+   the kernel buffer is full, and until enough sound has been played
-
+   to allow the sound data to be buffered. The call always returns the
-   If the device is not in :const:`PCM_NONBLOCK` mode, this call will block
+   size of the data provided.
-   if the kernel buffer is full, and until enough sound has been played
-   to allow the sound data to be buffered.
 
    In :const:`PCM_NONBLOCK` mode, the call will return immediately, with a
    return value of zero, if the buffer is full. In this case, the data
-   should be written again at a later time.
+   should be written at a later time.
-
-   In case of a buffer underrun, this function will return the negative
-   size :const:`-EPIPE`, and no data is written.
-   At this point, the playback was already corrupted. If you want to play
-   the data nonetheless, call write again with the same data.
-   To avoid the problem in the future, try using a larger period size
-   and/or more periods, at the cost of higher latency.
 
    Note that this call completing means only that the samples were buffered
    in the kernel, and playout will continue afterwards. Make sure that the
    stream is drained before discarding the PCM handle.
 
-.. method:: PCM.pause([enable: int = True]) -> int
+.. method:: PCM.pause([enable=True])
 
    If *enable* is :const:`True`, playback or capture is paused.
    Otherwise, playback/capture is resumed.
 
-.. method:: PCM.drop() -> int
+.. method:: PCM.drop()
 
    Stop the stream and drop residual buffered frames.
 
    *New in 0.9*
 
-.. method:: PCM.drain() -> int
+.. method:: PCM.drain()
 
    For :const:`PCM_PLAYBACK` PCM objects, play residual buffered frames
    and then stop the stream. In :const:`PCM_NORMAL` mode,
@@ -417,14 +369,14 @@ PCM objects have the following methods:
 
    *New in 0.10*
 
-.. method:: PCM.close() -> None
+.. method:: PCM.close()
 
    Closes the PCM device.
 
    For :const:`PCM_PLAYBACK` PCM objects in :const:`PCM_NORMAL` mode,
    this function blocks until all pending playback is drained.
 
-.. method:: PCM.polldescriptors() -> list[tuple[int, int]]
+.. method:: PCM.polldescriptors()
 
    Returns a list of tuples of *(file descriptor, eventmask)* that can be
    used to wait for changes on the PCM with *select.poll*.
@@ -432,38 +384,29 @@ PCM objects have the following methods:
    The *eventmask* value is compatible with `poll.register`__ in the Python 
    :const:`select` module.
 
-.. method:: PCM.polldescriptors_revents(descriptors: list[tuple[int, int]]) -> int
+.. method:: PCM.set_tstamp_mode([mode=PCM_TSTAMP_ENABLE])
-
-   Processes the descriptor list returned by :func:`polldescriptors` after
-   using it with *select.poll*, and returns a single *eventmask* value that
-   is meaningful for deciding whether :func:`read` or :func:`write` should
-   be called.
-
-   *New in 0.11*
-
-.. method:: PCM.set_tstamp_mode([mode: int = PCM_TSTAMP_ENABLE])
 
    Set the ALSA timestamp mode on the device. The mode argument can be set to
    either :const:`PCM_TSTAMP_NONE` or :const:`PCM_TSTAMP_ENABLE`.
 
-.. method:: PCM.get_tstamp_mode() -> int
+.. method:: PCM.get_tstamp_mode()
 
    Return the integer value corresponding to the ALSA timestamp mode. The
    return value can be either :const:`PCM_TSTAMP_NONE` or :const:`PCM_TSTAMP_ENABLE`.
 
-.. method:: PCM.set_tstamp_type([type: int = PCM_TSTAMP_TYPE_GETTIMEOFDAY]) -> None
+.. method:: PCM.set_tstamp_type([type=PCM_TSTAMP_TYPE_GETTIMEOFDAY])
 
    Set the ALSA timestamp mode on the device. The type argument
    can be set to either :const:`PCM_TSTAMP_TYPE_GETTIMEOFDAY`,
    :const:`PCM_TSTAMP_TYPE_MONOTONIC` or :const:`PCM_TSTAMP_TYPE_MONOTONIC_RAW`.
 
-.. method:: PCM.get_tstamp_type() -> int
+.. method:: PCM.get_tstamp_type()
 
    Return the integer value corresponding to the ALSA timestamp type. The
    return value can be either :const:`PCM_TSTAMP_TYPE_GETTIMEOFDAY`,
    :const:`PCM_TSTAMP_TYPE_MONOTONIC` or :const:`PCM_TSTAMP_TYPE_MONOTONIC_RAW`.
 
-.. method:: PCM.htimestamp() -> tuple[int, int, int]
+.. method:: PCM.htimestamp()
 
    Return a Python tuple *(seconds, nanoseconds, frames_available_in_buffer)*.
 
@@ -496,7 +439,7 @@ The most common reason for problems with playback of PCM audio is that writes
 to PCM devices must *exactly* match the data rate of the device.
 
 If too little data is written to the device, it will underrun, and
-ugly clicking sounds will occur. Conversely, if too much data is
+ugly clicking sounds will occur. Conversely, of too much data is
 written to the device, the write function will either block
 (:const:`PCM_NORMAL` mode) or return zero (:const:`PCM_NONBLOCK` mode).
 
@@ -525,7 +468,7 @@ Mixer Objects
 
 Mixer objects provides access to the ALSA mixer API.
 
-.. class:: Mixer(control: str = 'Master', id: int = 0, cardindex: int = -1, device: str = 'default') -> Mixer
+.. class:: Mixer(control='Master', id=0, cardindex=-1, device='default')
 
    Arguments are:
 
@@ -552,20 +495,20 @@ Mixer objects provides access to the ALSA mixer API.
 
 Mixer objects have the following methods:
 
-.. method:: Mixer.cardname() -> str
+.. method:: Mixer.cardname()
 
    Return the name of the sound card used by this Mixer object
 
-.. method:: Mixer.mixer() -> str
+.. method:: Mixer.mixer()
 
    Return the name of the specific mixer controlled by this object, For example
    ``'Master'`` or ``'PCM'``
 
-.. method:: Mixer.mixerid() -> int
+.. method:: Mixer.mixerid()
 
    Return the ID of the ALSA mixer controlled by this object.
 
-.. method:: Mixer.switchcap() -> int
+.. method:: Mixer.switchcap()
 
    Returns a list of the switches which are defined by this specific mixer.
    Possible values in this list are:
@@ -585,7 +528,7 @@ Mixer objects have the following methods:
    To manipulate these switches use the :meth:`setrec` or
    :meth:`setmute` methods
 
-.. method:: Mixer.volumecap() -> int
+.. method:: Mixer.volumecap()
 
    Returns a list of the volume control capabilities of this
    mixer. Possible values in the list are:
@@ -601,7 +544,7 @@ Mixer objects have the following methods:
    'Joined Capture Volume'   Manipulate sound capture volume for all channels at a time
    ========================  ================
 
-.. method:: Mixer.getenum() -> tuple[str, list[str]]
+.. method:: Mixer.getenum()
 
    For enumerated controls, return the currently selected item and  the list of
    items available.
@@ -627,13 +570,13 @@ Mixer objects have the following methods:
    This method will return an empty tuple if the mixer is not an  enumerated
    control.
 
-.. method:: Mixer.setenum(index: int) -> None
+.. method:: Mixer.setenum(index)
 
    For enumerated controls, sets the currently selected item.
    *index* is an index into the list of available enumerated items returned
    by :func:`getenum`.
 
-.. method:: Mixer.getrange(pcmtype: int = PCM_PLAYBACK, units: int = VOLUME_UNITS_RAW) -> tuple[int, int]
+.. method:: Mixer.getrange(pcmtype=PCM_PLAYBACK, units=VOLUME_UNITS_RAW)
 
    Return the volume range of the ALSA mixer controlled by this object.
    The value is a tuple of integers whose meaning is determined by the
@@ -647,7 +590,7 @@ Mixer objects have the following methods:
    The optional *units* argument can be one of :const:`VOLUME_UNITS_PERCENTAGE`,
    :const:`VOLUME_UNITS_RAW`, or :const:`VOLUME_UNITS_DB`.
 
-.. method:: Mixer.getvolume(pcmtype: int = PCM_PLAYBACK, units: int = VOLUME_UNITS_PERCENTAGE) -> int
+.. method:: Mixer.getvolume(pcmtype=PCM_PLAYBACK, units=VOLUME_UNITS_PERCENTAGE)
 
    Returns a list with the current volume settings for each channel. The list
    elements are integers whose meaning is determined by the *units* argument.
@@ -660,7 +603,7 @@ Mixer objects have the following methods:
    The optional *units* argument can be one of :const:`VOLUME_UNITS_PERCENTAGE`,
    :const:`VOLUME_UNITS_RAW`, or :const:`VOLUME_UNITS_DB`.
 
-.. method:: Mixer.setvolume(volume: int, pcmtype: int = PCM_PLAYBACK, units: int = VOLUME_UNITS_PERCENTAGE, channel: (int | None) = None) -> None
+.. method:: Mixer.setvolume(volume, channel=None, pcmtype=PCM_PLAYBACK, units=VOLUME_UNITS_PERCENTAGE)
 
    Change the current volume settings for this mixer. The *volume* argument
    is an integer whose meaning is determined by the *units* argument.
@@ -677,14 +620,14 @@ Mixer objects have the following methods:
    The optional *units* argument can be one of :const:`VOLUME_UNITS_PERCENTAGE`,
    :const:`VOLUME_UNITS_RAW`, or :const:`VOLUME_UNITS_DB`.
 
-.. method:: Mixer.getmute() -> list[int]
+.. method:: Mixer.getmute()
 
    Return a list indicating the current mute setting for each channel.
    0 means not muted, 1 means muted.
 
    This method will fail if the mixer has no playback switch capabilities.
 
-.. method:: Mixer.setmute(mute: bool, channel: (int | None) = None) -> None
+.. method:: Mixer.setmute(mute, [channel])
 
    Sets the mute flag to a new value. The *mute* argument is either 0 for not
    muted, or 1 for muted.
@@ -694,14 +637,14 @@ Mixer objects have the following methods:
 
    This method will fail if the mixer has no playback mute capabilities
 
-.. method:: Mixer.getrec() -> list[int]
+.. method:: Mixer.getrec()
 
    Return a list indicating the current record mute setting for each channel.
    0 means not recording, 1 means recording.
 
    This method will fail if the mixer has no capture switch capabilities.
 
-.. method:: Mixer.setrec(capture: int, channel: (int | None) = None) -> None
+.. method:: Mixer.setrec(capture, [channel])
 
    Sets the capture mute flag to a new value. The *capture* argument
    is either 0 for no capture, or 1 for capture.
@@ -711,7 +654,7 @@ Mixer objects have the following methods:
 
    This method will fail if the mixer has no capture switch capabilities.
 
-.. method:: Mixer.polldescriptors() -> list[tuple[int, int]]
+.. method:: Mixer.polldescriptors()
 
    Returns a list of tuples of *(file descriptor, eventmask)* that can be
    used to wait for changes on the mixer with *select.poll*.
@@ -719,13 +662,13 @@ Mixer objects have the following methods:
    The *eventmask* value is compatible with `poll.register`__ in the Python 
    :const:`select` module.
 
-.. method:: Mixer.handleevents() -> int
+.. method:: Mixer.handleevents()
 
    Acknowledge events on the :func:`polldescriptors` file descriptors
    to prevent subsequent polls from returning the same events again.
    Returns the number of events that were acknowledged.
 
-.. method:: Mixer.close() -> None
+.. method:: Mixer.close()
 
    Closes the Mixer device.
 

doc/terminology.rst

@@ -85,21 +85,6 @@ Period size
    each write should contain exactly 32 frames of sound data, and each
    read will return either 32 frames of data or nothing at all.
 
-.. _term-sample-size:
-
-Sample size
-   Each sample takes *physical_bits* of space. *nominal_bits* tells
-   how many least significant bits are used. This is the bit depth
-   in the format name and sometimes called just *sample bits* or
-   *format width*. *significant_bits* tells how many most significant
-   bits of the *nominal_bits* are used by the sample. This can be thought
-   of as the *sample resolution*. This is visualized as follows::
-
-    MSB |00000000 XXXXXXXX XXXXXXXX 00000000| LSB
-                  |--significant--|
-                  |---------nominal---------|
-        |-------------physical--------------|
-
 Once you understand these concepts, you will be ready to use the PCM API. Read
 on.
 

isine.py

@@ -7,7 +7,6 @@
 from __future__ import print_function
 
 import sys
-import time
 from threading import Thread
 from multiprocessing import Queue
 
@@ -16,15 +15,14 @@ if sys.version_info[0] < 3:
 else:
     from queue import Empty
 
-from math import pi, sin, ceil
+from math import pi, sin
 import struct
-import itertools
 import alsaaudio
 
 sampling_rate = 48000
 
 format = alsaaudio.PCM_FORMAT_S16_LE
-pack_format = 'h'  # short int, matching S16
+framesize = 2 # bytes per frame for the values above
 channels = 2
 
 def nearest_frequency(frequency):
@@ -36,28 +34,28 @@ def generate(frequency, duration = 0.125):
     # generate a buffer with a sine wave of `frequency`
     # that is approximately `duration` seconds long
 
+    # the buffersize we approximately want
+    target_size = int(sampling_rate * channels * duration)
+
     # the length of a full sine wave at the frequency
     cycle_size = int(sampling_rate / frequency)
 
-    # number of full cycles we can fit into the duration
+    # number of full cycles we can fit into target_size
-    factor = int(ceil(duration * frequency))
+    factor = int(target_size / cycle_size)
 
-    # total number of frames
+    size = max(int(cycle_size * factor), 1)
-    size = cycle_size * factor
     
     sine = [ int(32767 * sin(2 * pi * frequency * i / sampling_rate)) \
              for i in range(size)]
              
-    if channels > 1:
+    return struct.pack('%dh' % size, *sine)
-        sine = list(itertools.chain.from_iterable(itertools.repeat(x, channels) for x in sine))
-
-    return struct.pack(str(size * channels) + pack_format, *sine)
                                                                                   
 
 class SinePlayer(Thread):
     
     def __init__(self, frequency = 440.0):
-        Thread.__init__(self, daemon=True)
+        Thread.__init__(self)
+        self.setDaemon(True)
         self.device = alsaaudio.PCM(channels=channels, format=format, rate=sampling_rate)
         self.queue = Queue()
         self.change(frequency)
@@ -81,17 +79,16 @@ class SinePlayer(Thread):
         while True:
             try:
                 buffer = self.queue.get(False)
+                self.device.setperiodsize(int(len(buffer) / framesize))
+                self.device.write(buffer)
             except Empty:
-                pass
                 if buffer:
-                if self.device.write(buffer) < 0:
+                    self.device.write(buffer)
-                    print("Playback buffer underrun! Continuing nonetheless ...")
                 
 
 isine = SinePlayer()
 isine.start()
 
-time.sleep(1)
+def change(f):
-isine.change(1000)
+    isine.change(f)
-time.sleep(1)
     

loopback.py

@@ -70,12 +70,7 @@ class Loopback(object):
 		self.capture = capture
 		self.capture_pd = PollDescriptor.from_alsa_object('capture', capture)
 
-		self.run_after_stop = None
-		if run_after_stop:
 		self.run_after_stop = run_after_stop.split(' ')
-
-		self.run_before_start = None
-		if run_before_start:
 		self.run_before_start = run_before_start.split(' ')
 		self.run_after_stop_did_run = False
 
@@ -234,7 +229,6 @@ class VolumeForwarder(object):
 		self.playback_control = playback_control
 		self.capture_control = capture_control
 		self.active = True
-		self.volume = None
 
 	def start(self):
 		self.active = True

playbacktest.py

@@ -47,8 +47,7 @@ if __name__ == '__main__':
     # Read data from stdin
     data = f.read(320)
     while data:
-        if out.write(data) < 0:
+        out.write(data)
-            print("Playback buffer underrun! Continuing nonetheless ...")
         data = f.read(320)
     out.close()
         

playwav.py

@@ -39,8 +39,7 @@ def play(device, f):
 	data = f.readframes(periodsize)
 	while data:
 		# Read data from stdin
-		if device.write(data) < 0:
+		device.write(data)
-			print("Playback buffer underrun! Continuing nonetheless ...")
 		data = f.readframes(periodsize)
 
 

recordtest.py

@@ -59,8 +59,6 @@ if __name__ == '__main__':
 		# Read data from device
 		l, data = inp.read()
 
-		if l < 0:
+		if l:
-			print("Capture buffer overrun! Continuing nonetheless ...")
-		elif l:
 			f.write(data)
 			time.sleep(.001)

setup.py

@@ -8,7 +8,7 @@ from setuptools import setup
 from setuptools.extension import Extension
 from sys import version
 
-pyalsa_version = '0.11.0'
+pyalsa_version = '0.10.1'
 
 if __name__ == '__main__':
     setup(