From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 3 Nov 2000 10:11:50 +0000 (+0000)
Subject: Big rawmidi update - added subdevices support.
X-Git-Tag: v1.0.3~1085
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=cc214bdfea8f35a5f072e6a2a8cfe33223a56e22;p=alsa-lib.git

Big rawmidi update - added subdevices support.
---

diff --git a/include/rawmidi.h b/include/rawmidi.h
index 4fbce8e6..2d4a65b7 100644
--- a/include/rawmidi.h
+++ b/include/rawmidi.h
@@ -24,9 +24,8 @@ int snd_rawmidi_close(snd_rawmidi_t *handle);
 int snd_rawmidi_poll_descriptor(snd_rawmidi_t *handle);
 int snd_rawmidi_block_mode(snd_rawmidi_t *handle, int enable);
 int snd_rawmidi_info(snd_rawmidi_t *handle, snd_rawmidi_info_t * info);
-int snd_rawmidi_stream_params(snd_rawmidi_t *handle, snd_rawmidi_params_t * params);
-int snd_rawmidi_stream_setup(snd_rawmidi_t *handle, snd_rawmidi_setup_t * setup);
-int snd_rawmidi_stream_status(snd_rawmidi_t *handle, snd_rawmidi_status_t * status);
+int snd_rawmidi_params(snd_rawmidi_t *handle, snd_rawmidi_params_t * params);
+int snd_rawmidi_status(snd_rawmidi_t *handle, snd_rawmidi_status_t * status);
 int snd_rawmidi_output_drop(snd_rawmidi_t *handle);
 int snd_rawmidi_output_drain(snd_rawmidi_t *handle);
 int snd_rawmidi_input_drain(snd_rawmidi_t *handle);
diff --git a/src/rawmidi/rawmidi.c b/src/rawmidi/rawmidi.c
index a89ea2d6..f18dc087 100644
--- a/src/rawmidi/rawmidi.c
+++ b/src/rawmidi/rawmidi.c
@@ -163,35 +163,24 @@ int snd_rawmidi_info(snd_rawmidi_t *rmidi, snd_rawmidi_info_t * info)
 	return 0;
 }
 
-int snd_rawmidi_stream_params(snd_rawmidi_t *rmidi, snd_rawmidi_params_t * params)
+int snd_rawmidi_params(snd_rawmidi_t *rmidi, snd_rawmidi_params_t * params)
 {
 	if (!rmidi || !params)
 		return -EINVAL;
 	if (params->stream < 0 || params->stream > 1)
 		return -EINVAL;
-	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_STREAM_PARAMS, params) < 0)
+	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_PARAMS, params) < 0)
 		return -errno;
 	return 0;
 }
 
-int snd_rawmidi_stream_setup(snd_rawmidi_t *rmidi, snd_rawmidi_setup_t * setup)
-{
-	if (!rmidi || !setup)
-		return -EINVAL;
-	if (setup->stream < 0 || setup->stream > 1)
-		return -EINVAL;
-	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_STREAM_SETUP, setup) < 0)
-		return -errno;
-	return 0;
-}
-
-int snd_rawmidi_stream_status(snd_rawmidi_t *rmidi, snd_rawmidi_status_t * status)
+int snd_rawmidi_status(snd_rawmidi_t *rmidi, snd_rawmidi_status_t * status)
 {
 	if (!rmidi || !status)
 		return -EINVAL;
 	if (status->stream < 0 || status->stream > 1)
 		return -EINVAL;
-	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_STREAM_STATUS, status) < 0)
+	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_STATUS, status) < 0)
 		return -errno;
 	return 0;
 }
@@ -201,7 +190,7 @@ int snd_rawmidi_output_drop(snd_rawmidi_t *rmidi)
 	int str = SND_RAWMIDI_STREAM_OUTPUT;
 	if (!rmidi)
 		return -EINVAL;
-	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_STREAM_DROP, &str) < 0)
+	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_DROP, &str) < 0)
 		return -errno;
 	return 0;
 }
@@ -212,7 +201,7 @@ int snd_rawmidi_stream_drain(snd_rawmidi_t *rmidi, int str)
 		return -EINVAL;
 	if (str < 0 || str > 1)
 		return -EINVAL;
-	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_STREAM_DRAIN, &str) < 0)
+	if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_DRAIN, &str) < 0)
 		return -errno;
 	return 0;
 }
diff --git a/test/midiloop.c b/test/midiloop.c
index 96bd91df..ae41498c 100644
--- a/test/midiloop.c
+++ b/test/midiloop.c
@@ -182,10 +182,10 @@ int main(int argc, char** argv)
 	bzero(&ostat, sizeof(ostat));
 	istat.stream = SND_RAWMIDI_STREAM_INPUT;
 	ostat.stream = SND_RAWMIDI_STREAM_OUTPUT;
-	err = snd_rawmidi_stream_status(handle_in, &istat);
+	err = snd_rawmidi_status(handle_in, &istat);
 	if (err < 0)
 		fprintf(stderr, "input stream status error: %d\n", err);
-	err = snd_rawmidi_stream_status(handle_out, &ostat);
+	err = snd_rawmidi_status(handle_out, &ostat);
 	if (err < 0)
 		fprintf(stderr, "output stream status error: %d\n", err);
 	printf("input.status.queue = %li\n", istat.queue);