Skip to content

Implementation of audio logging. #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevindeland merged 1 commit into from
Aug 10, 2018
Merged

Implementation of audio logging. #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions app/src/main/java/cmu/xprize/robotutor/RoboTutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import cmu.xprize.util.CLoaderView;
import cmu.xprize.comp_logging.CLogManager;
import cmu.xprize.comp_logging.CPerfLogManager;
import cmu.xprize.comp_logging.CAudioLogThread;
import cmu.xprize.robotutor.tutorengine.CTutorEngine;
import cmu.xprize.robotutor.tutorengine.ITutorManager;
import cmu.xprize.robotutor.tutorengine.widgets.core.IGuidView;
Expand Down Expand Up @@ -83,10 +84,10 @@
public class RoboTutor extends Activity implements IReadyListener, IRoboTutor {

// VARIABLES FOR QUICK DEBUG LAUNCH
private static final boolean QUICK_DEBUG = true;
private static final String debugTutorVariant = "countingx";
private static final String debugTutorId = "countingx:1_10";
private static final String debugTutorFile = "[file]countingx_1_10.json";
private static final boolean QUICK_DEBUG = false;
private static final String debugTutorVariant = "story.parrot";
private static final String debugTutorId = "story.parrot::ltr-A.rand.40";
private static final String debugTutorFile = "[sharedliteracy]ltr-A.rand.40.json";

private CTutorEngine tutorEngine;
private CMediaController mMediaController;
Expand Down Expand Up @@ -138,9 +139,11 @@ public class RoboTutor extends Activity implements IReadyListener, IRoboTutor {
public final static String DOWNLOAD_PATH = Environment.getExternalStorageDirectory() + File.separator + Environment.DIRECTORY_DOWNLOADS;
public final static String EXT_ASSET_PATH = Environment.getExternalStorageDirectory() + File.separator + TCONST.ROBOTUTOR_ASSET_FOLDER;

private final String TAG = "CRoboTutor";
private final String TAG = "CRoboTutor";
private final String ID_TAG = "StudentId";

private Thread audioLogThread;

@Override
protected void onCreate(Bundle savedInstanceState) {

Expand Down Expand Up @@ -206,6 +209,9 @@ protected void onCreate(Bundle savedInstanceState) {

Log.v(TAG, "External_Download:" + DOWNLOAD_PATH);

audioLogThread = new CAudioLogThread(readyLogPath, logFilename);
audioLogThread.start();

// Get the primary container for tutors
//
setContentView(R.layout.robo_tutor);
Expand Down Expand Up @@ -780,6 +786,8 @@ protected void onDestroy() {
TTS = null;
}

audioLogThread.interrupt();

logManager.postDateTimeStamp(GRAPH_MSG, "RoboTutor:SessionEnd");
logManager.stopLogging();
perfLogManager.stopLogging();
Expand Down
Loading