From 0b124b53bf7ba89d8c182aadbe68f2007647938d Mon Sep 17 00:00:00 2001
From: Frank van de Pol <fvdpol@home.nl>
Date: Sun, 23 May 1999 18:34:46 +0000
Subject: [PATCH] Small fixes to get ALSA sequencer and example code for
 alsa-lib (playmidi1) working again.

---
 src/seq/seq.c    |  2 ++
 test/playmidi1.c | 37 +++++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/seq/seq.c b/src/seq/seq.c
index 879c9b9f..12d05321 100644
--- a/src/seq/seq.c
+++ b/src/seq/seq.c
@@ -203,6 +203,8 @@ int snd_seq_set_client_info(void *handle, snd_seq_client_info_t * info)
 	seq = (snd_seq_t *) handle;
 	if (!seq || !info)
 		return -EINVAL;
+	info->client = seq->client;
+	info->type = USER_CLIENT;
 	if (ioctl(seq->fd, SND_SEQ_IOCTL_SET_CLIENT_INFO, info) < 0)
 		return -errno;
 	return 0;
diff --git a/test/playmidi1.c b/test/playmidi1.c
index 67da77ab..d65545fd 100644
--- a/test/playmidi1.c
+++ b/test/playmidi1.c
@@ -45,11 +45,14 @@
 
 //#define DEST_QUEUE_NUMBER 0
 #define DEST_QUEUE_NUMBER 7
-#define DEST_CLIENT_NUMBER 64
-//#define DEST_CLIENT_NUMBER 72
+//#define DEST_CLIENT_NUMBER 64
+#define DEST_CLIENT_NUMBER 72
 //#define DEST_CLIENT_NUMBER 128
 //#define DEST_CLIENT_NUMBER 255
 //#define DEST_CLIENT_NUMBER SND_SEQ_ADDRESS_BROADCAST
+#define DEST_PORT_NUMBER 0
+
+//#define USE_REALTIME
 
 FILE *F;
 void* seq_handle = NULL;
@@ -61,7 +64,7 @@ int local_tempo = 500000;
 
 static int dest_queue = DEST_QUEUE_NUMBER;
 static int dest_client = DEST_CLIENT_NUMBER;
-static int dest_port = 0;
+static int dest_port = DEST_PORT_NUMBER;
 static int source_channel = 0;
 static int source_port = 0;
 
@@ -122,7 +125,7 @@ void write_ev_im(snd_seq_event_t * ev)
 	while (written<0) {
 	  written = snd_seq_event_output (seq_handle, ev);
 		if (written<0) {
-		  printf("written = %i (%s)\n", written, snd_strerror(written));
+		  //printf("written = %i (%s)\n", written, snd_strerror(written));
 		  sleep(1);
 		  //sched_yield ();
 		}
@@ -152,7 +155,7 @@ void write_ev_var(snd_seq_event_t * ev, int len, void *ptr)
 	while (written<0) {
 	  written = snd_seq_event_output (seq_handle, ev);
 	        if (written<0) {
-	          printf("written = %i (%s)\n", written, snd_strerror(written));
+	          //printf("written = %i (%s)\n", written, snd_strerror(written));
 	          sleep(1);
 		  //sched_yield ();
 		}
@@ -187,17 +190,19 @@ void do_header(int format, int ntracks, int division)
 	}
 	/* set ppq */
 	{
-		snd_seq_queue_info_t queue_info;
-
-		queue_info.queue = 1;	/* queue we're using */
-		queue_info.ppq = ppq;
-		//queue_info.tempo = -1;	/* don't change */
-		queue_info.tempo = 500000;	/* don't change */
-		if (snd_seq_set_queue_info (seq_handle, dest_queue, &queue_info) < 0) {
-		        perror("ioctl");
-			exit(1);
+		snd_seq_queue_tempo_t	tempo;
+		if (snd_seq_get_queue_tempo(seq_handle, dest_queue, &tempo) < 0) {
+	    		perror ("get_queue_tempo");
+	    		exit (1);
+		}
+		if (tempo.ppq != ppq) {
+			tempo.ppq = ppq;
+			if (snd_seq_set_queue_tempo(seq_handle, dest_queue, &tempo) < 0) {
+	    			perror ("set_queue_tempo");
+	    			exit (1);
+			}
+			printf("ALSA Timer updated, PPQ = %d\n", tempo.ppq);
 		}
-		printf("ALSA Timer updated, PPQ = %d\n", queue_info.ppq);
 	}
 
 	/* start playing... */
@@ -626,7 +631,7 @@ int main(int argc, char *argv[])
 	src_port_info.type = SND_SEQ_PORT_TYPE_MIDI_GENERIC;
 	src_port_info.midi_channels = 16;
 	src_port_info.synth_voices = 0;
-	src_port_info.use = 0;
+	//src_port_info.use = 0;
 	src_port_info.kernel = NULL;
 	tmp = snd_seq_create_port (seq_handle, &src_port_info);
 	if (tmp < 0)
-- 
2.47.3