X-Git-Url: https://git.cworth.org/git?p=mnemon;a=blobdiff_plain;f=mnemon.c;h=3523ef822685c33489b64f9e63e619053d4237ed;hp=87e1fd08b6530089cca9d12270405d0b1569d1c7;hb=4fc1ac21aaa449a2a5c89259079715c2e8319877;hpb=4afda67e5f06fd1a8e77459355a325a42cd2d594

diff --git a/mnemon.c b/mnemon.c
index 87e1fd0..3523ef8 100644
--- a/mnemon.c
+++ b/mnemon.c
@@ -64,7 +64,8 @@ typedef enum {
 typedef enum {
     CHALLENGE_TYPE_TEXT,
     CHALLENGE_TYPE_IMAGE,
-    CHALLENGE_TYPE_AUDIO
+    CHALLENGE_TYPE_AUDIO,
+    CHALLENGE_TYPE_MIDI
 } challenge_type_t;
 
 typedef struct _category {
@@ -288,6 +289,9 @@ category_print (category_t	*category,
     case CHALLENGE_TYPE_AUDIO:
 	fprintf (file, "audio");
 	break;
+    case CHALLENGE_TYPE_MIDI:
+	fprintf (file, "midi");
+	break;
     }
     fprintf (file, "\n\n");
 
@@ -654,6 +658,8 @@ mnemon_load_category (mnemon_t		*mnemon,
 		category->challenge_type = CHALLENGE_TYPE_IMAGE;
 	    } else if (strcmp (value, "audio") == 0) {
 		category->challenge_type = CHALLENGE_TYPE_AUDIO;
+	    } else if (strcmp (value, "midi") == 0) {
+		category->challenge_type = CHALLENGE_TYPE_MIDI;
 	    } else {
 		fprintf (stderr, "Unknown value for \"challenge\" option \"%s\" at %s:%d\n",
 			 value, path, line_count);
@@ -1041,6 +1047,7 @@ mnemon_handle_command (mnemon_t		*mnemon,
     const char *arg;
     int len;
     switch (command[0]) {
+	/* 'h' for histogram */
 	case 'h':
 	{
 	    char *category = NULL;
@@ -1059,6 +1066,12 @@ mnemon_handle_command (mnemon_t		*mnemon,
 	    mnemon_print_histogram (mnemon, category, length);
 	}
 	break;
+	/* 'r' for repeat */
+        case 'r':
+	{
+	    /* Nothing necessary for repeating. */
+	}
+	break;
         default:
 	    printf ("Unknown command: %s\n", command);
 	    break;
@@ -1182,6 +1195,9 @@ mnemon_show_challenge (mnemon_t *mnemon,
     case CHALLENGE_TYPE_AUDIO:
 	program = "play";
 	break;
+    case CHALLENGE_TYPE_MIDI:
+	program = "timidity -Os";
+	break;
     }
 
     xasprintf (&command, "%s %s/%s >/dev/null 2>&1 &",
@@ -1289,6 +1305,16 @@ mnemon_do_challenges (mnemon_t *mnemon)
 				(start.tv_sec + start.tv_usec / 1e6),
 				category->time_limit);
 	free (response);
+
+	/* Replay audio challenges for reinforcement. */
+	if (category->challenge_type == CHALLENGE_TYPE_AUDIO ||
+	    category->challenge_type == CHALLENGE_TYPE_MIDI)
+	{
+	    mnemon_show_challenge (mnemon, category->challenge_type,
+				   item->challenge);
+	    printf ("%s\n", item->challenge);
+	    sleep (2);
+	}
     } while (mnemon->to_introduce ||
 	     mnemon->unlearned ||
 	     mnemon->to_master > 0);