markil3/UniversalMusicPlayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merges the two album tables into one.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

23
interface/src/main/java/edu/regis/universeplayer/player/BrowserPlayer.java
View File

@@ -110,9 +110,8 @@ public class BrowserPlayer implements Player<InternetSong>, UpdateListener
{
try
{
QueryFuture<Void> future = new ForwardedFuture(getBrowser()
return (QueryFuture<Void>) new ForwardedFuture(getBrowser()
.sendObject(new CommandQuit()));
return future;
}
catch (IOException e)
{
@@ -190,10 +189,21 @@ public class BrowserPlayer implements Player<InternetSong>, UpdateListener
{
try
{
return new ForwardedFuture(getBrowser()
.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PAUSE)));
QueryFuture<PlaybackStatus> future = this.getStatus();
switch (future.get())
{
case PLAYING -> {
return new ForwardedFuture(getBrowser()
.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PAUSE)));
}
case PAUSED, STOPPED, FINISHED -> {
return new ForwardedFuture(getBrowser()
.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PLAY)));
}
}
return null;
}
catch (IOException e)
catch (IOException | InterruptedException | ExecutionException e)
{
logger.error("Could not send message", e);
return null;
@@ -326,7 +336,7 @@ public class BrowserPlayer implements Player<InternetSong>, UpdateListener
*
* @param forward - Whether the error should be thrown from the foreground
* script or the background script.
* @return
* @return The return value containing error details.
*/
public QueryFuture<Void> throwError(boolean forward)
{
@@ -349,6 +359,7 @@ public class BrowserPlayer implements Player<InternetSong>, UpdateListener
if (object instanceof PlaybackInfo)
{
status = new PlaybackEvent(this, (PlaybackInfo) object);
logger.info("Internet playback {}", status.getInfo());
this.listeners.forEach(l -> l.onPlaybackChanged(status));
}
}