neviyn/musicplayer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplified playback engine selection.

Browse Source
This commit is contained in:
neviyn 2016-12-05 14:51:16 +00:00
parent 1cd6bfccfc
commit a98ef2209e
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/musicplayer/SwingUIModule.java
View File

@ -25,20 +25,15 @@ class SwingUIModule extends AbstractModule {
bind(IPlaylist.class).to(TabbedJTablePlaylist.class).in(Singleton.class); bind(IPlaylist.class).to(TabbedJTablePlaylist.class).in(Singleton.class);
bind(ILibrary.class).to(JTreeLibrary.class).in(Singleton.class); bind(ILibrary.class).to(JTreeLibrary.class).in(Singleton.class);
bind(PlayerCallbackInterface.class).to(PlayerGUI.class).in(Singleton.class); bind(PlayerCallbackInterface.class).to(PlayerGUI.class).in(Singleton.class);
String engineName = ConfigManager.getPlayerEngine(); Engine engine = Engine.valueOf(ConfigManager.getPlayerEngine());
boolean engineSet = false; if (engine.isAvailable()) {
for(Engine engine : Engine.values()){
if(engineName.equals(engine.getEngineName()) && engine.isAvailable()){
bind(IPlayer.class).to(engine.getEngineImplementation()).in(Singleton.class);
ConfigManager.setPlayerEngine(engine.getEngineName());
engineSet = true;
}
}
if(!engineSet){ // If the user has set an invalid engine, try and set a usable one.
for(Engine engine : Engine.values()){
if(engine.isAvailable()){
bind(IPlayer.class).to(engine.getEngineImplementation()).in(Singleton.class); bind(IPlayer.class).to(engine.getEngineImplementation()).in(Singleton.class);
ConfigManager.setPlayerEngine(engine.getEngineName()); ConfigManager.setPlayerEngine(engine.getEngineName());
} else { // If the user has set an invalid engine, try and set a usable one.
for (Engine potentialEngine : Engine.values()) {
if (potentialEngine.isAvailable()) {
bind(IPlayer.class).to(potentialEngine.getEngineImplementation()).in(Singleton.class);
ConfigManager.setPlayerEngine(potentialEngine.getEngineName());
break; break;
} }
} }