X-Git-Url: https://git.cworth.org/git?p=scherzo;a=blobdiff_plain;f=scherzo.c;h=7288d5fdbe7efb98b7b4c87879b6549cbbf8f23d;hp=665795977fcf4e2d5c9d397fe3b1579cab9af3ba;hb=HEAD;hpb=e61e2b33d79fd2c55521ef46432ef3c40f3efc5b

diff --git a/scherzo.c b/scherzo.c
index 6657959..7288d5f 100644
--- a/scherzo.c
+++ b/scherzo.c
@@ -66,8 +66,6 @@ typedef struct scherzo
      * keyboard". Any "piano keyboard" key knows its own octave and
      * accidental already. */
     int keyboard_octave;
-
-    int midi_fd;
     snd_midi_event_t *snd_midi_event;
 
     mnemon_t mnemon;
@@ -280,8 +278,6 @@ on_key_press_event (GtkWidget *widget,
 
     if (pitch != PITCH_NOT_A_PITCH) 
     {
-	pitch = scherzo_key_spell_pitch (&scherzo->key, pitch);
-
 	scherzo_press_note (scherzo, pitch);
 
 	return TRUE;
@@ -389,8 +385,6 @@ on_key_release_event (unused (GtkWidget *widget),
 
     if (pitch != PITCH_NOT_A_PITCH)
     {
-	pitch = scherzo_key_spell_pitch (&scherzo->key, pitch);
-
 	scherzo_release_note (scherzo, pitch);
 
 	return TRUE;
@@ -401,17 +395,6 @@ on_key_release_event (unused (GtkWidget *widget),
     return FALSE;
 }
 
-/* Return true if 'a' and 'b' sound identical, (even if spelled differently)
- *
- * This comparison considers octaves as significant. So Bb and A# in
- * the same octave are considered enharmonic, but Bb and A# in
- * different octaves are not. */
-static int
-_pitches_are_enharmonic (pitch_t a, pitch_t b)
-{
-    return pitch_to_midi (a) == pitch_to_midi (b);
-}
-
 /* Determine a chord name (if any) from the current notes pressed */
 
 typedef struct analyzed_pitch {
@@ -875,7 +858,7 @@ pitch_group_remove_pitch_enharmonic (pitch_group_t *group, pitch_t pitch)
     int i;
 
     for (i = 0; i < group->num_pitches; i++)
-	if (_pitches_are_enharmonic (group->pitches[i], pitch))
+	if (pitch_enharmonic_to (group->pitches[i], pitch))
 	    pitch_group_remove_pitch_at (group, i);
 }
 
@@ -1007,6 +990,8 @@ scherzo_press_note (scherzo_t *scherzo, pitch_t pitch)
 {
     int i;
 
+    pitch = scherzo_key_spell_pitch (&scherzo->key, pitch);
+
 #define NUM_RECENT_PITCHES 7
     static pitch_t recent_pitches[NUM_RECENT_PITCHES];
 
@@ -1014,9 +999,13 @@ scherzo_press_note (scherzo_t *scherzo, pitch_t pitch)
 	     (NUM_RECENT_PITCHES - 1) * sizeof (pitch_t));
     recent_pitches[NUM_RECENT_PITCHES - 1] = pitch;
 
-    if (pitches_are_diatonic_scale (recent_pitches, NUM_RECENT_PITCHES))
+    if (pitches_are_diatonic_scale (recent_pitches, NUM_RECENT_PITCHES)) {
 	scherzo_set_key (scherzo, recent_pitches[0]);
 
+	/* Respell pitch according to new key. */
+	pitch = scherzo_key_spell_pitch (&scherzo->key, pitch);
+    }
+
     /* Do nothing if this note is already pressed. */
     for (i = 0; i < scherzo->notes_pressed.num_pitches; i++)
 	if (scherzo->notes_pressed.pitches[i] == pitch)
@@ -1033,6 +1022,8 @@ scherzo_press_note (scherzo_t *scherzo, pitch_t pitch)
 static void
 scherzo_release_note (scherzo_t *scherzo, pitch_t pitch)
 {
+    pitch = scherzo_key_spell_pitch (&scherzo->key, pitch);
+
     pitch_group_remove_pitch_enharmonic (&scherzo->notes_pressed, pitch);
 
     scherzo_update_notes_and_chord (scherzo);
@@ -1193,17 +1184,25 @@ _score_challenge (scherzo_t *scherzo)
 }
 #endif
 
+typedef struct
+{
+    scherzo_t *scherzo;
+    int fd;
+} scherzo_midi_closure_t;
+
 static int
 on_midi_input (unused (GIOChannel *channel),
 	       unused (GIOCondition condition),
 	       void *user_data)
 {
+    scherzo_midi_closure_t *closure = user_data;
     unsigned char buf[MIDI_BUF_SIZE], *next;
-    scherzo_t *scherzo = user_data;
+    scherzo_t *scherzo = closure->scherzo;
+    int fd = closure->fd;
     ssize_t remaining;
     snd_seq_event_t event;
 
-    remaining = read (scherzo->midi_fd, buf, MIDI_BUF_SIZE);
+    remaining = read (fd, buf, MIDI_BUF_SIZE);
 
     next = buf;
     while (remaining) {
@@ -1255,11 +1254,38 @@ on_midi_input (unused (GIOChannel *channel),
     return TRUE;
 }
 
+static void *
+listen_to_alsa_midi (void *data)
+{
+    scherzo_midi_closure_t *closure = data;
+    int out_fd = closure->fd;
+    snd_rawmidi_t *midi_in;
+    unsigned char buf[MIDI_BUF_SIZE];
+    ssize_t bytes;
+    int err;
+
+    err = snd_rawmidi_open (&midi_in, NULL, "virtual", 0);
+    if (err) {
+	fprintf (stderr, "Failed to open virtual MIDI handle.");
+	return NULL;
+    }
+
+    while (1) {
+	bytes = snd_rawmidi_read (midi_in, buf, MIDI_BUF_SIZE);
+	write (out_fd, buf, bytes);
+    }
+
+    return NULL;
+}
+
 int
 main (int argc, char *argv[])
 {
     GtkWidget *drawing_area;
+    GIOChannel *channel;
     scherzo_t scherzo;
+    int alsa_midi_fd[2];
+    scherzo_midi_closure_t midi_out, alsa_midi_in, alsa_midi_out;
     int err;
 
     srand (time (NULL));
@@ -1305,17 +1331,29 @@ main (int argc, char *argv[])
     }
 
 #define MIDI_DEVICE "/dev/midi1"
-    scherzo.midi_fd = open (MIDI_DEVICE, O_RDONLY);
-    if (scherzo.midi_fd < 0) {
-	printf ("failed to open " MIDI_DEVICE ". Midi input will not be available.\n");
-    } else {
-	GIOChannel *channel;
 
-	channel = g_io_channel_unix_new (scherzo.midi_fd);
+    midi_out.scherzo = &scherzo;
+    midi_out.fd = open (MIDI_DEVICE, O_RDONLY);
+    if (midi_out.fd < 0) {
+	printf ("Failed to open " MIDI_DEVICE ". You will need to connect a MIDI device.\n");
+    } else {
+	channel = g_io_channel_unix_new (midi_out.fd);
 	g_io_channel_set_encoding (channel, NULL, NULL);
-	g_io_add_watch (channel, G_IO_IN, on_midi_input, &scherzo);
+	g_io_add_watch (channel, G_IO_IN, on_midi_input, &midi_out);
     }
 
+    pipe (alsa_midi_fd);
+
+    alsa_midi_in.scherzo = &scherzo;
+    alsa_midi_in.fd = alsa_midi_fd[1];
+    g_thread_new ("scherzo-vmidi", listen_to_alsa_midi, &alsa_midi_in);
+
+    alsa_midi_out.scherzo = &scherzo;
+    alsa_midi_out.fd = alsa_midi_fd[0];
+    channel = g_io_channel_unix_new (alsa_midi_out.fd);
+    g_io_channel_set_encoding (channel, NULL, NULL);
+    g_io_add_watch (channel, G_IO_IN, on_midi_input, &alsa_midi_out);
+
     scherzo.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
     gtk_window_set_default_size (GTK_WINDOW (scherzo.window), 1000, 600);