X-Git-Url: https://git.cworth.org/git?p=scherzo;a=blobdiff_plain;f=scherzo.c;h=7288d5fdbe7efb98b7b4c87879b6549cbbf8f23d;hp=696e816e7e3f4ede87856be7dd294c754b4b23c2;hb=HEAD;hpb=5b1797d26aff3a1b2f0cbe83583496b42abcd056 diff --git a/scherzo.c b/scherzo.c index 696e816..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; @@ -94,12 +92,6 @@ scherzo_press_pedal (scherzo_t *scherzo); static void scherzo_release_pedal (scherzo_t *scherzo); -static void -_judge_pitch (scherzo_t *scherzo, pitch_t pitch); - -static void -_score_challenge (scherzo_t *scherzo); - static void pitch_group_remove_pitches (pitch_group_t *group); @@ -286,11 +278,7 @@ 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); - _judge_pitch (scherzo, pitch); - gtk_widget_queue_draw (scherzo->window); return TRUE; } @@ -397,11 +385,7 @@ 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); - _score_challenge (scherzo); - gtk_widget_queue_draw (scherzo->window); return TRUE; } @@ -411,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 { @@ -885,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); } @@ -913,20 +886,6 @@ pitch_group_remove_pitches (pitch_group_t *group) static void scherzo_update_notes_and_chord (scherzo_t *scherzo) -{ - if (scherzo->notes_pressed.num_pitches == 0 && - scherzo->notes_pedaled.num_pitches == 0) - { - score_remove_notes (scherzo->score); - - score_remove_chords (scherzo->score); - - gtk_widget_queue_draw (scherzo->window); - } -} - -static void -scherzo_press_note (scherzo_t *scherzo, pitch_t pitch) { void *local = talloc_new (NULL); pitch_group_t *chord; @@ -935,16 +894,6 @@ scherzo_press_note (scherzo_t *scherzo, pitch_t pitch) pitch_t *root; int i; - /* 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) - return; - - pitch_group_add_pitch (&scherzo->notes_pressed, pitch); - - if (scherzo->pedal_pressed) - pitch_group_add_pitch (&scherzo->notes_pedaled, pitch); - /* Remove all notes/chords from score, then add current notes. */ score_remove_notes (scherzo->score); score_remove_chords (scherzo->score); @@ -960,7 +909,17 @@ scherzo_press_note (scherzo_t *scherzo, pitch_t pitch) /* Don't print root pitch for octaves and inversions, * (since a pitch name alone looks like a major triad) */ if (signature->num_degrees < 3) { + /* In fact, don't print anything for octaves and + * inversions for now. It leads to a bit of flashing when + * playing chords. + * + * FIXME: What I'd like to have here is a small timeout, + * such that names only appear once an interval has been + * held for at least 100 ms or so. With that, it would be + * nice to display the interval names once again. + * chord_name = talloc_strdup (local, signature->name); + */ } else { _spell_chord_by_signature (&scherzo->notes_pressed, signature, *root); @@ -990,26 +949,90 @@ scherzo_press_note (scherzo_t *scherzo, pitch_t pitch) SCORE_DURATION_WHOLE); } + gtk_widget_queue_draw (scherzo->window); + talloc_free (local); } +static void +scherzo_set_key (scherzo_t *scherzo, pitch_t pitch) +{ + scherzo_key_init (&scherzo->key, pitch); + score_set_key (scherzo->score, pitch); +} + +static bool +pitches_are_diatonic_scale (pitch_t *pitches, int num_pitches) +{ + int diatonic_half_steps[7] = { + 0, 2, 4, 5, 7, 9, 11 + }; + int half_steps; + pitch_t root; + int i; + + if (num_pitches < 7) + return 0; + + root = pitches[0]; + + for (i = 0; i < 7; i++) { + half_steps = pitch_from_root_in_half_steps (pitches[i], root); + if (half_steps != diatonic_half_steps[i]) + return false; + } + + return true; +} + +static void +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]; + + memmove (recent_pitches, recent_pitches + 1, + (NUM_RECENT_PITCHES - 1) * sizeof (pitch_t)); + recent_pitches[NUM_RECENT_PITCHES - 1] = pitch; + + 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) + return; + + pitch_group_add_pitch (&scherzo->notes_pressed, pitch); + + if (scherzo->pedal_pressed) + pitch_group_add_pitch (&scherzo->notes_pedaled, pitch); + + scherzo_update_notes_and_chord (scherzo); +} + 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); - if (scherzo->notes_pressed.num_pitches == 0) - scherzo_update_notes_and_chord (scherzo); + scherzo_update_notes_and_chord (scherzo); } -static pitch_t +static void scherzo_press_note_midi (scherzo_t *scherzo, unsigned char midi_note) { - pitch_t pitch = pitch_from_midi (midi_note); - - scherzo_press_note (scherzo, pitch); - - return pitch; + scherzo_press_note (scherzo, pitch_from_midi (midi_note)); } static void @@ -1050,6 +1073,7 @@ scherzo_release_pedal (scherzo_t *scherzo) scherzo_update_notes_and_chord (scherzo); } +#if 0 static void _select_challenge (scherzo_t *scherzo) { @@ -1158,20 +1182,27 @@ _score_challenge (scherzo_t *scherzo) _select_challenge (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; - pitch_t pitch; - int need_redraw = FALSE; - remaining = read (scherzo->midi_fd, buf, MIDI_BUF_SIZE); + remaining = read (fd, buf, MIDI_BUF_SIZE); next = buf; while (remaining) { @@ -1188,14 +1219,10 @@ on_midi_input (unused (GIOChannel *channel), /* Incomplete event. Nothing to do. */ break; case SND_SEQ_EVENT_NOTEON: - pitch = scherzo_press_note_midi (scherzo, event.data.note.note); - _judge_pitch (scherzo, pitch); - need_redraw = TRUE; + scherzo_press_note_midi (scherzo, event.data.note.note); break; case SND_SEQ_EVENT_NOTEOFF: scherzo_release_note_midi (scherzo, event.data.note.note); - _score_challenge (scherzo); - need_redraw = TRUE; break; case SND_SEQ_EVENT_CLOCK: /* Ignore for now as my piano sends a constant stream of these. */ @@ -1223,18 +1250,42 @@ on_midi_input (unused (GIOChannel *channel), } } - if (need_redraw) - gtk_widget_queue_draw (scherzo->window); - /* Return TRUE to continue to get called in the future. */ 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)); @@ -1262,8 +1313,7 @@ main (int argc, char *argv[]) scherzo.pedal_pressed = 0; /* Default to key of C Major, naturally. */ - scherzo_key_init (&scherzo.key, PITCH_CLASS_LITERAL (C, NATURAL)); - score_set_key (scherzo.score, scherzo.key.pitch); + scherzo_set_key (&scherzo, PITCH_CLASS_LITERAL (C, NATURAL)); mnemon_init (&scherzo.mnemon); /* XXX: Should create a default file if one cannot be loaded. */ @@ -1281,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);