Skip to content

Commit 20bae79

Browse files
committed
Added debug variable to read unhashed filenames
1 parent 90c7e0c commit 20bae79

4 files changed

Lines changed: 10 additions & 3 deletions

File tree

app/src/main/assets/tutors/story_reading/animator_graph.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
"CLEARAUDIO": {
329329
"type": "MODULE",
330330
"reuse": true,
331-
"COMMENT": "module that deletes current audio data",
331+
"COMMENT": "module that deletes current audio data recorded for this utterance in Narrate Mode",
332332
"tracks": [
333333
{"type": "COMMAND","id": "SstoryReading","method": "clearAudioData","parms": "none","features": ""}
334334
]

app/src/main/java/cmu/xprize/robotutor/tutorengine/graph/type_audio.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222

2323
import org.json.JSONObject;
2424

25+
import java.util.Objects;
2526
import java.util.Timer;
2627
import java.util.TimerTask;
2728

2829
import cmu.xprize.robotutor.RoboTutor;
2930
import cmu.xprize.robotutor.startup.configuration.Configuration;
31+
import cmu.xprize.robotutor.tutorengine.CDebugLauncher;
3032
import cmu.xprize.robotutor.tutorengine.CMediaController;
3133
import cmu.xprize.robotutor.tutorengine.CMediaManager;
3234
import cmu.xprize.robotutor.tutorengine.IMediaListener;
@@ -242,7 +244,8 @@ public void preLoad(IMediaListener owner) {
242244

243245
mPathResolved = getScope().parseTemplate(mSourcePath);
244246

245-
if(AudioDataStorage.contentCreationOn) {
247+
248+
if(AudioDataStorage.contentCreationOn || Objects.equals(CDebugLauncher.getDebugVar("use_hash_name"), "false")) {
246249
mPathResolved = mPathResolved.replace("sdcard/Download/RoboTutor/assets/story_questions/audio/en//", "");
247250
_useHashName = false;
248251
}

comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerASB.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,6 @@ private void trackNarration(boolean start) {
869869
Log.d(TAG, "HERE");
870870
}
871871

872-
Log.d("ArrayError_Chirag", spokenWords.size() + " is spokenWords.size(). Current word: " + spokenWords.get(spokenWords.size() - 1));
873872
// Update the display
874873
//
875874
onUpdate(spokenWords.toArray(new String[spokenWords.size()]));

comp_reading/src/main/java/cmu/xprize/rt_component/CRt_ViewManagerMari.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,11 @@ public void prevSentence() {
614614

615615
}
616616

617+
@Override
618+
public void enableNarrateMode(boolean isNarrateMode, boolean keepExtraAudio) {
619+
620+
}
621+
617622
public void enableNarrateMode(boolean isNarrateMode) {
618623

619624
}

0 commit comments

Comments
 (0)