More mixer updates and some fixes...

diff --git a/include/error.h b/include/error.h
index fe4adca6cf7eb93cc6d988c4129cfe509bbcae24..c5e1a4fb448bc158fb2dd716bc7889108c035846 100644 (file)
--- a/include/error.h
+++ b/include/error.h
@@ -3,7 +3,7 @@
  */
 
 #define SND_ERROR_BEGIN                                500000
-#define SND_ERROR_UNCOMPATIBLE_VERSION         (SND_ERROR_BEGIN+0)
+#define SND_ERROR_INCOMPATIBLE_VERSION         (SND_ERROR_BEGIN+0)
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/control/control.c b/src/control/control.c
index 41139648ddc8d247bd830e5fa38399ff206d55bd..8fd59880de651115bb8761cf5793f63716460608 100644 (file)
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -57,9 +57,9 @@ int snd_ctl_open(snd_ctl_t **handle, int card)
                close(fd);
                return -errno;
        }
-       if (SND_PROTOCOL_UNCOMPATIBLE(ver, SND_CTL_VERSION_MAX)) {
+       if (SND_PROTOCOL_INCOMPATIBLE(ver, SND_CTL_VERSION_MAX)) {
                close(fd);
-               return -SND_ERROR_UNCOMPATIBLE_VERSION;
+               return -SND_ERROR_INCOMPATIBLE_VERSION;
        }
        ctl = (snd_ctl_t *) calloc(1, sizeof(snd_ctl_t));
        if (ctl == NULL) {

diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c
index 580ba11ec3575729bcd30e01d979af0b87e68639..ec3bc21fdb4ea0d45f25170fe2046296e5fc5842 100644 (file)
--- a/src/mixer/mixer.c
+++ b/src/mixer/mixer.c
@@ -57,9 +57,9 @@ int snd_mixer_open(snd_mixer_t **handle, int card, int device)
                close(fd);
                return -errno;
        }
-       if (SND_PROTOCOL_UNCOMPATIBLE(ver, SND_MIXER_VERSION_MAX)) {
+       if (SND_PROTOCOL_INCOMPATIBLE(ver, SND_MIXER_VERSION_MAX)) {
                close(fd);
-               return -SND_ERROR_UNCOMPATIBLE_VERSION;
+               return -SND_ERROR_INCOMPATIBLE_VERSION;
        }
        mixer = (snd_mixer_t *) calloc(1, sizeof(snd_mixer_t));
        if (mixer == NULL) {

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index cba88f35c6db3189961a9b4e17c220c259784c0d..350b4ad3a7a349936d50b0b85ec3e621136f8c20 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -57,9 +57,9 @@ int snd_pcm_open(snd_pcm_t **handle, int card, int device, int mode)
                close(fd);
                return -errno;
        }
-       if (SND_PROTOCOL_UNCOMPATIBLE(ver, SND_PCM_VERSION_MAX)) {
+       if (SND_PROTOCOL_INCOMPATIBLE(ver, SND_PCM_VERSION_MAX)) {
                close(fd);
-               return -SND_ERROR_UNCOMPATIBLE_VERSION;
+               return -SND_ERROR_INCOMPATIBLE_VERSION;
        }
        pcm = (snd_pcm_t *) calloc(1, sizeof(snd_pcm_t));
        if (pcm == NULL) {

diff --git a/src/pcm/pcm_loopback.c b/src/pcm/pcm_loopback.c
index 198627e05baa704dea4f859676a29a1f9cca19e0..3da41c7bfc0f94123b6b1e6b3c0e995354beea1b 100644 (file)
--- a/src/pcm/pcm_loopback.c
+++ b/src/pcm/pcm_loopback.c
@@ -58,9 +58,9 @@ int snd_pcm_loopback_open(snd_pcm_loopback_t **handle, int card, int device, int
                close(fd);
                return -errno;
        }
-       if (SND_PROTOCOL_UNCOMPATIBLE(ver, SND_PCM_LB_VERSION_MAX)) {
+       if (SND_PROTOCOL_INCOMPATIBLE(ver, SND_PCM_LB_VERSION_MAX)) {
                close(fd);
-               return -SND_ERROR_UNCOMPATIBLE_VERSION;
+               return -SND_ERROR_INCOMPATIBLE_VERSION;
        }
        lb = (snd_pcm_loopback_t *) calloc(1, sizeof(snd_pcm_loopback_t));
        if (lb == NULL) {

diff --git a/src/rawmidi/rawmidi.c b/src/rawmidi/rawmidi.c
index 4905f183718279fee5b5c1742ad00c38a3ef9906..bc1101f0db454e1aab32619317f5cc1d6c58d8c3 100644 (file)
--- a/src/rawmidi/rawmidi.c
+++ b/src/rawmidi/rawmidi.c
@@ -57,9 +57,9 @@ int snd_rawmidi_open(snd_rawmidi_t **handle, int card, int device, int mode)
                close(fd);
                return -errno;
        }
-       if (SND_PROTOCOL_UNCOMPATIBLE(ver, SND_RAWMIDI_VERSION_MAX)) {
+       if (SND_PROTOCOL_INCOMPATIBLE(ver, SND_RAWMIDI_VERSION_MAX)) {
                close(fd);
-               return -SND_ERROR_UNCOMPATIBLE_VERSION;
+               return -SND_ERROR_INCOMPATIBLE_VERSION;
        }
        rmidi = (snd_rawmidi_t *) calloc(1, sizeof(snd_rawmidi_t));
        if (rmidi == NULL) {

diff --git a/src/seq/seq.c b/src/seq/seq.c
index 7dedd870e70e5b463ae2f39f6b81ce28a8405938..4b3e46429b7940c9d00a8b2bed8b0f3abd1444bc 100644 (file)
--- a/src/seq/seq.c
+++ b/src/seq/seq.c
@@ -72,9 +72,9 @@ int snd_seq_open(snd_seq_t **handle, int mode)
                close(fd);
                return -errno;
        }
-       if (SND_PROTOCOL_UNCOMPATIBLE(ver, SND_SEQ_VERSION_MAX)) {
+       if (SND_PROTOCOL_INCOMPATIBLE(ver, SND_SEQ_VERSION_MAX)) {
                close(fd);
-               return -SND_ERROR_UNCOMPATIBLE_VERSION;
+               return -SND_ERROR_INCOMPATIBLE_VERSION;
        }
        if (ioctl(fd, SND_SEQ_IOCTL_CLIENT_ID, &client) < 0) {
                close(fd);

diff --git a/src/timer/timer.c b/src/timer/timer.c
index fed8528007113500a70ebf3233e9b78f06c3c4fa..673ca0f4893056d1003228c72707f13ac22c5d6c 100644 (file)
--- a/src/timer/timer.c
+++ b/src/timer/timer.c
@@ -51,9 +51,9 @@ int snd_timer_open(snd_timer_t **handle)
                close(fd);
                return -errno;
        }
-       if (SND_PROTOCOL_UNCOMPATIBLE(ver, SND_TIMER_VERSION_MAX)) {
+       if (SND_PROTOCOL_INCOMPATIBLE(ver, SND_TIMER_VERSION_MAX)) {
                close(fd);
-               return -SND_ERROR_UNCOMPATIBLE_VERSION;
+               return -SND_ERROR_INCOMPATIBLE_VERSION;
        }
        tmr = (snd_timer_t *) calloc(1, sizeof(snd_timer_t));
        if (tmr == NULL) {