Merges the two album tables into one.

Albums are independent of how the song is stored. We don't need to separate them.
This commit is contained in:
Markil3
2021-09-18 15:00:12 -06:00
parent 8bb7086a44
commit 2e2748f9e9
26 changed files with 2553 additions and 2576 deletions

View File

@@ -271,11 +271,11 @@ public class PlayerControls extends JPanel implements PlaybackListener
CommandConfirmation confirmation = status.getConfirmation();
if (status.getConfirmation().wasSuccessful())
{
switch (status.get())
if (status.get() == PlaybackStatus.PLAYING)
{
case PLAYING -> confirmation =
PlayerManager.getPlayers().pause()
.getConfirmation();
confirmation =
PlayerManager.getPlayers().pause()
.getConfirmation();
}
}
if (confirmation != null && !confirmation.wasSuccessful())
@@ -379,7 +379,7 @@ public class PlayerControls extends JPanel implements PlaybackListener
void setUpdateProgress(int updated, int toUpdate, String updating)
{
this.updateProgress.setString(updating);
if (toUpdate == 0)
if (toUpdate == 0 || updated == toUpdate)
{
this.updateProgress.setVisible(false);
// this.updateProgress.setPreferredSize(new Dimension(this.updateProgress.getPreferredSize().width, 0));
@@ -399,6 +399,7 @@ public class PlayerControls extends JPanel implements PlaybackListener
this.updateProgress.setValue(updated);
}
}
this.repaint();
}
/**