More mixer updates and some fixes...

8 files changed, 15 insertions, 15 deletions

diff --git a/include/error.h b/include/error.h
index fe4adca6..c5e1a4fb 100644
--- 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 41139648..8fd59880 100644
--- 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 580ba11e..ec3bc21f 100644
--- 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 cba88f35..350b4ad3 100644
--- 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 198627e0..3da41c7b 100644
--- 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 4905f183..bc1101f0 100644
--- 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 7dedd870..4b3e4642 100644
--- 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 fed85280..673ca0f4 100644
--- 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) {