Skip to content

Commit

Permalink
hardcoding audio offset
Browse files Browse the repository at this point in the history
  • Loading branch information
emilysachs committed Jul 1, 2019
1 parent bb4f017 commit 5657c06
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/java/io/thoughtworksarts/riot/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
public class Main extends Application {

public static final String DEFAULT_FILES_PATH = "src/main/resources/facialrecognitionmodels/";
public static final String PATH_TO_CONFIG = System.getProperty("user.home") + "/Desktop/config.json";
public static final String PATH_TO_CONFIG = "src/main/resources/config.json";

private MediaControl mediaControl;

Expand All @@ -51,7 +51,7 @@ public void start(Stage primaryStage) throws Exception {
FacialEmotionRecognitionAPI facialRecognition = new FacialEmotionRecognitionAPI(imageProcessor, deepLearningProcessor, pathToEmotionMapFile, jsonConfiguration.getMode());
BranchingLogic branchingLogic = new BranchingLogic(facialRecognition, jsonTranslator,jsonConfiguration);
RiotAudioPlayer audioPlayer = AudioPlayerConfigurator.getConfiguredRiotAudioPlayer(audioPath);
mediaControl = new MediaControl(branchingLogic, audioPlayer,startTime ,filmPath, jsonTranslator.convertToDuration(jsonConfiguration.getAudioOffset()));
mediaControl = new MediaControl(branchingLogic, audioPlayer,startTime ,filmPath, jsonTranslator.convertToDuration("10:39.200"));
MoviePlayer moviePlayer = new MoviePlayer(primaryStage, mediaControl);
moviePlayer.initialise();
mediaControl.play();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.TimeZone;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class JsonTranslator {

@Getter private ConfigRoot root;
Expand Down

0 comments on commit 5657c06

Please sign in to comment.