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

Pausing now resets the highlighting to the current song. If another entry is then selected before pressing play then that song will be played rather than resuming the paused song.

Browse Source
This commit is contained in:
neviyn 2016-02-29 02:28:26 +00:00
parent fb611c3062
commit d125759c06
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/musicplayer/PlayerGUI.java
View File

@ -40,7 +40,6 @@ public class PlayerGUI implements PlayerCallbackInterface, LibraryCallbackInterf
public PlayerGUI() { public PlayerGUI() {
createUI(); createUI();
DatabaseManager.init();
resetTree(); resetTree();
Thread seekBarUpdater = new Thread(() -> { Thread seekBarUpdater = new Thread(() -> {
boolean running = true; boolean running = true;
@ -58,6 +57,7 @@ public class PlayerGUI implements PlayerCallbackInterface, LibraryCallbackInterf
} }
public static void main(String[] args) { public static void main(String[] args) {
DatabaseManager.init();
PlayerGUI playerGUI = new PlayerGUI(); PlayerGUI playerGUI = new PlayerGUI();
JFrame frame = new JFrame(); JFrame frame = new JFrame();
frame.setContentPane(playerGUI.mainPanel); frame.setContentPane(playerGUI.mainPanel);
@ -347,7 +347,10 @@ public class PlayerGUI implements PlayerCallbackInterface, LibraryCallbackInterf
toolBar.add(playButton); toolBar.add(playButton);
JButton pauseButton = new JButton("Pause"); JButton pauseButton = new JButton("Pause");
pauseButton.setMnemonic('E'); pauseButton.setMnemonic('E');
pauseButton.addActionListener(e -> player.pause()); pauseButton.addActionListener(e -> {
player.pause();
setSongHighlighting(player.getCurrentSong()); // Resume won't function if a different song is selected.
});
toolBar.add(pauseButton); toolBar.add(pauseButton);
JButton stopButton = new JButton("Stop"); JButton stopButton = new JButton("Stop");
stopButton.setMnemonic('S'); stopButton.setMnemonic('S');