diff --git a/core/src/bms/player/beatoraja/Config.java b/core/src/bms/player/beatoraja/Config.java index 9353927a..f0548c06 100644 --- a/core/src/bms/player/beatoraja/Config.java +++ b/core/src/bms/player/beatoraja/Config.java @@ -188,6 +188,7 @@ public class Config implements Validatable { private String overrideDownloadURL = ""; private String downloadDirectory = DEFAULT_DOWNLOAD_DIRECTORY; public static final String DEFAULT_DOWNLOAD_DIRECTORY = "http_download"; + private boolean autoSwitchHttpDownloadSource = true; private int irSendCount = 5; @@ -826,7 +827,15 @@ public void setObsAction(String stateName, String actionName) { } } - public boolean validate() { + public boolean isAutoSwitchHttpDownloadSource() { + return autoSwitchHttpDownloadSource; + } + + public void setAutoSwitchHttpDownloadSource(boolean autoSwitchHttpDownloadSource) { + this.autoSwitchHttpDownloadSource = autoSwitchHttpDownloadSource; + } + + public boolean validate() { displaymode = (displaymode != null) ? displaymode : DisplayMode.WINDOW; resolution = (resolution != null) ? resolution : Resolution.HD; diff --git a/core/src/bms/player/beatoraja/MainController.java b/core/src/bms/player/beatoraja/MainController.java index 461db229..8a33c86a 100644 --- a/core/src/bms/player/beatoraja/MainController.java +++ b/core/src/bms/player/beatoraja/MainController.java @@ -508,8 +508,7 @@ public void create() { } if (config.isEnableHttp()) { - HttpDownloadSource httpDownloadSource = HttpDownloadProcessor.DOWNLOAD_SOURCES.get(config.getDownloadSource()).build(config); - httpDownloadProcessor = new HttpDownloadProcessor(this, httpDownloadSource, config.getDownloadDirectory()); + httpDownloadProcessor = new HttpDownloadProcessor(this, config); DownloadTaskState.initialize(httpDownloadProcessor); DownloadTaskMenu.setProcessor(httpDownloadProcessor); } diff --git a/core/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml b/core/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml index d9b6b93e..8e75ba5b 100644 --- a/core/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml +++ b/core/src/bms/player/beatoraja/launcher/PlayConfigurationView.fxml @@ -419,6 +419,7 @@ +