better format names and error messages

diff --git a/Lib/test/output/test_linuxaudiodev b/Lib/test/output/test_linuxaudiodev
index 21ccf1f30af98d576067edec5fce869e44149743..3e8c691073e7110b6a81f1719496823f2d9f3775 100644 (file)
--- a/Lib/test/output/test_linuxaudiodev
+++ b/Lib/test/output/test_linuxaudiodev
@@ -3,5 +3,5 @@ expected rate >= 0, not -1
 expected sample size >= 0, not -2
 nchannels must be 1 or 2, not 3
 unknown audio encoding: 177
-sample size 16 expected for Little-endian 16-bit unsigned audio: 8 received
-sample size 8 expected for Standard unsigned 8-bit audio: 16 received
+for linear unsigned 16-bit little-endian audio, expected sample size 16, not 8
+for linear unsigned 8-bit audio, expected sample size 8, not 16

diff --git a/Modules/linuxaudiodev.c b/Modules/linuxaudiodev.c
index 120c0bfc388156753bb04f68bb2a3b79ceb64257..13575a5dc0da5e61a482a55f6f553aa104e4ac02 100644 (file)
--- a/Modules/linuxaudiodev.c
+++ b/Modules/linuxaudiodev.c
@@ -63,15 +63,14 @@ static struct {
     uint32_t   a_fmt;
     char       *a_name;
 } audio_types[] = {
-    {  8,      AFMT_MU_LAW, "Logarithmic mu-law audio" },
-    {  8,      AFMT_A_LAW,  "Logarithmic A-law audio" },
-    {  8,      AFMT_U8,     "Standard unsigned 8-bit audio" },
-    {  8,      AFMT_S8,     "Standard signed 8-bit audio" },
-    { 16,      AFMT_U16_BE, "Big-endian 16-bit unsigned audio" },
-    { 16,      AFMT_U16_LE, "Little-endian 16-bit unsigned audio" },
-    { 16,      AFMT_S16_BE, "Big-endian 16-bit signed audio" },
-    { 16,      AFMT_S16_LE, "Little-endian 16-bit signed audio" },
-    { 16,      AFMT_S16_NE, "Native-endian 16-bit signed audio" },
+    {  8,      AFMT_MU_LAW, "logarithmic mu-law 8-bit audio" },
+    {  8,      AFMT_A_LAW,  "logarithmic A-law 8-bit audio" },
+    {  8,      AFMT_U8,     "linear unsigned 8-bit audio" },
+    {  8,      AFMT_S8,     "linear signed 8-bit audio" },
+    { 16,      AFMT_U16_BE, "linear unsigned 16-bit big-endian audio" },
+    { 16,      AFMT_U16_LE, "linear unsigned 16-bit little-endian audio" },
+    { 16,      AFMT_S16_BE, "linear signed 16-bit big-endian audio" },
+    { 16,      AFMT_S16_LE, "linear signed 16-bit little-endian audio" },
 };
 
 static int n_audio_types = sizeof(audio_types) / sizeof(audio_types[0]);
@@ -95,7 +94,7 @@ newladobject(PyObject *arg)
     else if (strcmp(mode, "w") == 0)
         imode = O_WRONLY;
     else {
-        PyErr_SetString(LinuxAudioError, "Mode should be one of 'r', or 'w'");
+        PyErr_SetString(LinuxAudioError, "mode should be 'r' or 'w'");
         return NULL;
     }
 
@@ -256,15 +255,15 @@ lad_setparameters(lad_t *self, PyObject *args)
     }
     if (audio_types[n].a_bps != ssize) {
        PyErr_Format(PyExc_ValueError, 
-                    "sample size %d expected for %s: %d received",
-                    audio_types[n].a_bps, audio_types[n].a_name, ssize);
+                    "for %s, expected sample size %d, not %d",
+                    audio_types[n].a_name, audio_types[n].a_bps, ssize);
        return NULL;
     }
 
     if (emulate == 0) {
        if ((self->x_afmts & audio_types[n].a_fmt) == 0) {
            PyErr_Format(PyExc_ValueError, 
-                        "format not supported by device: %s",
+                        "%s format not supported by device",
                         audio_types[n].a_name);
            return NULL;
        }