Removed mouth shape H (special shape for 'L' sound)

This commit is contained in:
Daniel Wolf 2016-06-26 20:07:48 +02:00
parent 9bf8355742
commit 8c9466bcf3
3 changed files with 3 additions and 8 deletions

View File

@ -19,8 +19,7 @@ EnumConverter<Shape>::member_data ShapeConverter::getMemberData() {
{ Shape::D, "D" },
{ Shape::E, "E" },
{ Shape::F, "F" },
{ Shape::G, "G" },
{ Shape::H, "H" }
{ Shape::G, "G" }
};
}

View File

@ -1,6 +1,5 @@
#pragma once
#include <iostream>
#include "EnumConverter.h"
// The classic Hanna-Barbera mouth shapes A-F phus the common supplements G-H
@ -13,8 +12,7 @@ enum class Shape {
D, // Mouth wide open (b[u]t, m[y], sh[ou]ld...)
E, // h[ow]
F, // Pout ([o]ff, sh[ow])
G, // F, V
H // L
G // F, V
};
class ShapeConverter : public EnumConverter<Shape> {

View File

@ -35,6 +35,7 @@ Shape getShape(Phone phone) {
case Phone::AH:
case Phone::EY:
case Phone::HH:
case Phone::L:
return Shape::C;
case Phone::AA:
@ -58,9 +59,6 @@ Shape getShape(Phone phone) {
case Phone::V:
return Shape::G;
case Phone::L:
return Shape::H;
default:
throw std::runtime_error("Unexpected Phone value.");
}