ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up code; status bar on main menu shows more info;

Browse Source
This commit is contained in:
Harrison Deng
2018-08-24 01:59:23 -05:00
parent b0b7be9141
commit b84a3d6280
3 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MainPage.java
View File

@@ -47,6 +47,7 @@ public class MainPage extends Page implements Observer {
super(0, 0);
this.mc = musicController;
this.mc.addObserver(this);
mc.getMusicList().addObserver(this);
this.amc = mmc;
this.amc.addObserver(this);
@@ -116,21 +117,36 @@ public class MainPage extends Page implements Observer {
@Override
public void dispose() {
dhv.dispose();
mc.getMusicList().deleteObserver(this);
super.dispose();
}
@Override
public void update(Observable o, Object arg) {
if (o == mc) {
if (amc.isSameSizeMusicList()) {
scrollText.setText("Currently playing: " + amc.getAudioMetadata(mc.getCurrentMusicFileHandle()).getTitle(), null);
} else {
scrollText.setText("Currently playing: " + mc.getCurrentMusicFileHandle().nameWithoutExtension().replace('_', ' '), null);
if (arg == mc.states.LOADED) {
if (amc.isSameSizeMusicList()) {
scrollText.setText("Currently playing: " + amc.getAudioMetadata(mc.getCurrentMusicFileHandle()).getTitle(), null);
} else {
scrollText.setText("Currently playing: " + mc.getCurrentMusicFileHandle().nameWithoutExtension().replace('_', ' '), null);
}
} else if (arg == mc.states.PAUSED) {
if (amc.isSameSizeMusicList()) {
scrollText.setText("Currently paused: " + amc.getAudioMetadata(mc.getCurrentMusicFileHandle()).getTitle(), null);
} else {
scrollText.setText("Currently paused: " + mc.getCurrentMusicFileHandle().nameWithoutExtension().replace('_', ' '), null);
}
}
} else if (o == amc) {
if (amc.size() != 0) {
scrollText.setText("Currently playing: " + amc.getAudioMetadata(mc.getCurrentMusicFileHandle()).getTitle(), null);
}
} else if (o == mc.getMusicList()) {
if (arg == mc.getMusicList().states.EMPTY) {
scrollText.setText("Couldn't find MP3/WAV files", null);
} else if (arg == mc.getMusicList().states.LOADING) {
scrollText.setText("Loading...", null);
}
}
}
}