modify to use global SongDatabaseAccessor

exch-bms2 · Oct 28, 2019 · d351c47 · d351c47
1 parent 2b613c9
commit d351c47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/bms/player/beatoraja/MainController.java b/src/bms/player/beatoraja/MainController.java
@@ -89,7 +89,6 @@ public class MainController extends ApplicationAdapter {
 	private PlayMode auto;
 	private boolean songUpdated;
 
-	private SongDatabaseAccessor songdb;
 	private SongInformationAccessor infodb;
 
 	private IRStatus[] ir;
@@ -154,7 +153,6 @@ public MainController(Path f, Config config, PlayerConfig player, PlayMode auto,
 		}
 		try {
 			Class.forName("org.sqlite.JDBC");
-			songdb = new SQLiteSongDatabaseAccessor(config.getSongpath(), config.getBmsroot());
 			if(config.isUseSongInfo()) {
 				infodb = new SongInformationAccessor(config.getSonginfopath());
 			}
@@ -204,7 +202,7 @@ public SkinOffset getOffset(int index) {
 	}
 
 	public SongDatabaseAccessor getSongDatabase() {
-		return songdb;
+		return MainLoader.getScoreDatabaseAccessor();
 	}
 
 	public SongInformationAccessor getInfoDatabase() {

diff --git a/src/bms/player/beatoraja/launcher/PlayConfigurationView.java b/src/bms/player/beatoraja/launcher/PlayConfigurationView.java
@@ -394,9 +394,7 @@ public void update(Config config) {
 
 		try {
 			Class.forName("org.sqlite.JDBC");
-			SongDatabaseAccessor songdb = new SQLiteSongDatabaseAccessor(config.getSongpath(),
-					config.getBmsroot());
-			tableController.init(songdb);
+			tableController.init(MainLoader.getScoreDatabaseAccessor());
 			tableController.update(Paths.get(config.getTablepath() + "/" + "default.json"));
 		} catch (ClassNotFoundException e) {
 			e.printStackTrace();
@@ -703,9 +701,7 @@ public void loadBMSPath(String updatepath){
 	public void loadBMS(String updatepath, boolean updateAll) {
 		commit();
 		try {
-			Class.forName("org.sqlite.JDBC");
-			SongDatabaseAccessor songdb = new SQLiteSongDatabaseAccessor(config.getSongpath(),
-					config.getBmsroot());
+			SongDatabaseAccessor songdb = MainLoader.getScoreDatabaseAccessor();
 			SongInformationAccessor infodb = config.isUseSongInfo() ?
 					new SongInformationAccessor(Paths.get("songinfo.db").toString()) : null;
 			Logger.getGlobal().info("song.db更新開始");
@@ -753,8 +749,7 @@ public void importScoreDataFromLR2() {
 
 		try {
 			Class.forName("org.sqlite.JDBC");
-			SongDatabaseAccessor songdb = new SQLiteSongDatabaseAccessor(config.getSongpath(),
-					config.getBmsroot());
+			SongDatabaseAccessor songdb = MainLoader.getScoreDatabaseAccessor();
 			String player = "player1";
 			ScoreDatabaseAccessor scoredb = new ScoreDatabaseAccessor(config.getPlayerpath() + "/" + player + "/score.db");
 			scoredb.createTable();