CHALLENGE_TYPE_TEXT,
CHALLENGE_TYPE_IMAGE,
CHALLENGE_TYPE_AUDIO,
- CHALLENGE_TYPE_MIDI
+ CHALLENGE_TYPE_MIDI,
+ CHALLENGE_TYPE_TEXT_TO_SPEECH
} challenge_type_t;
typedef struct _category {
case CHALLENGE_TYPE_MIDI:
fprintf (file, "midi");
break;
+ case CHALLENGE_TYPE_TEXT_TO_SPEECH:
+ fprintf (file, "text-to-speech");
+ break;
}
fprintf (file, "\n\n");
category->challenge_type = CHALLENGE_TYPE_AUDIO;
} else if (strcmp (value, "midi") == 0) {
category->challenge_type = CHALLENGE_TYPE_MIDI;
+ } else if (strcmp (value, "text-to-speech") == 0) {
+ category->challenge_type = CHALLENGE_TYPE_TEXT_TO_SPEECH;
} else {
fprintf (stderr, "Unknown value for \"challenge\" option \"%s\" at %s:%d\n",
value, path, line_count);
(time_limit == 0.0 || response_time < time_limit))
{
item->score++;
- mnemon->to_master--;
/* We reserve an item score of 0 for an item that has
* never been asked. */
if (item->score == 0) {
item->score = 1;
mnemon->unlearned--;
- mnemon->to_master--;
printf ("You got it!");
} else if (item->score < 0) {
printf ("Yes---just give me %d more.",
printf ("On your first try, no less!");
} else {
printf ("Masterful (%dx).", item->score);
+ if (mnemon->to_master)
+ mnemon->to_master--;
}
} else {
if (! correct)
printf (" Oops, you knew that, right? (%dx)\n ",
item->score);
mnemon->unlearned++;
- /* We add three here, (rather than just 2 to track the
- * change in the item's score below), as an extra
- * penalty. If the user is forgetting stuff learned
- * previously, then more time should be spent on mastering
- * than learning new items. */
- mnemon->to_master += item->score + 3;
+ /* We increase to_master here as an extra penalty. If the
+ * user is forgetting stuff learned previously, then more
+ * time should be spent on mastering than learning new
+ * items. Note that we only do this during the initial
+ * phase while new items are still being introduced. */
+ if (mnemon->to_introduce)
+ mnemon->to_master++;
/* We go to -2 to force a little extra reinforcement
* when re-learning an item, (otherwise, it will often
* get asked again immediately where it is easy to get
item->score = -2;
} else {
item->score--;
- mnemon->to_master++;
}
}
case CHALLENGE_TYPE_MIDI:
program = "timidity -Os";
break;
+ case CHALLENGE_TYPE_TEXT_TO_SPEECH:
+ program = "mnemon-tts";
+ break;
}
xasprintf (&command, "%s %s/%s >/dev/null 2>&1 &",