Added the ogg routing to voice prompts testing

This commit is contained in:
PaulStets 2018-08-08 10:55:59 +03:00
parent 3b64f67c97
commit 8eaedd8d38

View file

@ -23,6 +23,7 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.OsmandActionBarActivity; import net.osmand.plus.activities.OsmandActionBarActivity;
import net.osmand.plus.voice.AbstractPrologCommandPlayer; import net.osmand.plus.voice.AbstractPrologCommandPlayer;
import net.osmand.plus.voice.JSCommandBuilder; import net.osmand.plus.voice.JSCommandBuilder;
import net.osmand.plus.voice.JSMediaCommandPlayerImpl;
import net.osmand.plus.voice.JSTTSCommandPlayerImpl; import net.osmand.plus.voice.JSTTSCommandPlayerImpl;
import net.osmand.plus.voice.TTSCommandPlayerImpl; import net.osmand.plus.voice.TTSCommandPlayerImpl;
import net.osmand.plus.voice.CommandBuilder; import net.osmand.plus.voice.CommandBuilder;
@ -220,8 +221,8 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
} }
private void addButtons(final LinearLayout ll, CommandPlayer p) { private void addButtons(final LinearLayout ll, CommandPlayer p) {
if (p instanceof JSTTSCommandPlayerImpl) { if (p instanceof JSTTSCommandPlayerImpl || p instanceof JSMediaCommandPlayerImpl) {
addJSTTSPrompts(ll, (JSTTSCommandPlayerImpl) p); addJSTTSPrompts(ll, p);
return; return;
} }
addButton(ll, "Route calculated and number tests:", builder(p)); addButton(ll, "Route calculated and number tests:", builder(p));
@ -317,7 +318,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
return res; return res;
} }
private void addJSTTSPrompts(LinearLayout ll, JSTTSCommandPlayerImpl p) { private void addJSTTSPrompts(LinearLayout ll, CommandPlayer p) {
addButton(ll, "Route calculated and number tests:", jsBuilder(p)); addButton(ll, "Route calculated and number tests:", jsBuilder(p));
addButton(ll, "\u25BA (1.1) New route calculated, 150m, 230sec (00:03:50)", jsBuilder(p).newRouteCalculated(150, 230)); addButton(ll, "\u25BA (1.1) New route calculated, 150m, 230sec (00:03:50)", jsBuilder(p).newRouteCalculated(150, 230));
addButton(ll, "\u25BA (1.2) New route calculated, 1350m, 3680sec (01:01:20)", jsBuilder(p).newRouteCalculated(1350, 3680)); addButton(ll, "\u25BA (1.2) New route calculated, 1350m, 3680sec (01:01:20)", jsBuilder(p).newRouteCalculated(1350, 3680));
@ -398,8 +399,8 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
return p.newCommandBuilder(); return p.newCommandBuilder();
} }
private JSCommandBuilder jsBuilder(JSTTSCommandPlayerImpl p) { private JSCommandBuilder jsBuilder(CommandPlayer p) {
return p.newCommandBuilder(); return (JSCommandBuilder) p.newCommandBuilder();
} }
public void addButton(ViewGroup layout, final String description, final CommandBuilder builder){ public void addButton(ViewGroup layout, final String description, final CommandBuilder builder){