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

Adds the ability to play youtube videos.

Browse Source 
It still needs a bit of work, but playing and pausing are operational.
This commit is contained in:
Markil3
2021-08-16 22:42:44 -06:00
parent b546c81fa1
commit ede9132279
23 changed files with 799 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
interface/src/main/java/edu/regis/universeplayer/PlaybackStatus.java
View File

@@ -1,32 +0,0 @@
/*
* Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/
package edu.regis.universeplayer;
/**
* This contains possible states that a player can be in.
*/
public enum PlaybackStatus
{
/**
* The player is currently playing a song.
*/
PLAYING,
/**
* The player has been paused.
*/
PAUSED,
/**
* The player has a song loaded, but is not playing it.
*/
STOPPED,
/**
* The player has is stopped, but just finished a song and may have more.
*/
FINISHED,
/**
* No song is loaded.
*/
EMPTY
}

210
interface/src/main/java/edu/regis/universeplayer/browser/Browser.java
View File

@@ -12,11 +12,12 @@ import edu.regis.universeplayer.data.Song;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.Scanner;
import java.util.concurrent.*;
@@ -30,23 +31,19 @@ import java.util.concurrent.*;
public class Browser extends MessageRunner implements Player<InternetSong>
{
private static final Logger logger = LoggerFactory.getLogger(Browser.class);
private final Socket socket;
private final Process process;
private final Socket socket;
private final LinkedList<PlaybackListener> listeners = new LinkedList<>();
private InternetSong currentSong;
public static Browser createBrowser() throws IOException, InterruptedException
{
/*
* The maximum number of attempts that will be made to establish a
* connection.
*/
final int MAX_ATTEMPTS = 20;
/*
* How long the thread will sleep between connection attempts, in
* milliseconds.
*/
final long SLEEP_TIME = 500;
ServerSocket server = new ServerSocket(BrowserConstants.PORT, 50, InetAddress.getByName(null));
logger.debug("Server started.");
int startExit;
Socket socket = null;
Browser browser;
Process browserProcess = launchBrowser();
/*
@@ -69,24 +66,31 @@ public class Browser extends MessageRunner implements Player<InternetSong>
ConnectException connErr = null;
logger.debug("Attempting connection");
for (int attempts = 0; socket == null && attempts < MAX_ATTEMPTS; attempts++)
Socket socket = server.accept();
if (!socket.isBound())
{
try
{
socket = new Socket(BrowserConstants.IP, BrowserConstants.PORT);
}
catch (ConnectException e)
{
connErr = e;
logger.debug("Connection attempt {} failed, trying again", attempts);
Thread.sleep(SLEEP_TIME);
}
logger.error("Socket not bound");
}
if (socket == null)
else if (!socket.isConnected())
{
throw connErr;
logger.error("Socket not connected");
}
else if (socket.isClosed())
{
logger.error("Socket prematurely closed");
}
else if (socket.isInputShutdown())
{
logger.error("Socket input prematurely closed.");
}
else if (socket.isOutputShutdown())
{
logger.error("Socket input prematurely closed.");
}
else
{
logger.debug("Connection established.");
}
logger.debug("Browser connection established.");
browser = new Browser(socket, browserProcess);
return browser;
}
@@ -98,6 +102,17 @@ public class Browser extends MessageRunner implements Player<InternetSong>
this.process = process;
}
@Override
protected boolean onRun()
{
if (!socket.isConnected() || socket.isClosed() || socket.isInputShutdown() || socket.isOutputShutdown())
{
logger.debug("Socket closed, shutting down");
return true;
}
return false;
}
/**
* Utility method for launching a browser instance
*
@@ -155,7 +170,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
@Override
public Song getCurrentSong()
{
return null;
return this.currentSong;
}
@Override
@@ -178,23 +193,28 @@ public class Browser extends MessageRunner implements Player<InternetSong>
@Override
public QueryFuture<Void> close()
{
if (process != null)
{
logger.info("Destroying browser processes {}, {}", process, process.descendants().toArray(ProcessHandle[]::new));
process.descendants().forEach(ProcessHandle::destroy);
process.destroy();
}
else
{
logger.info("Process already destroyed.");
}
try
{
this.socket.close();
QueryFuture<Void> future = new ForwardedFuture(this.sendObject(new CommandQuit()));
return future;
}
catch (IOException e)
{
logger.error("Could not close browser socket", e);
logger.error("Could not deliver quit command", e);
logger.error("Destroying browser processes {}, {}", process, process.descendants().toArray(ProcessHandle[]::new));
try
{
socket.close();
}
catch (IOException ex)
{
logger.error("Could not close socket", ex);
}
finally
{
process.descendants().forEach(ProcessHandle::destroy);
process.destroy();
}
}
return null;
}
@@ -236,19 +256,43 @@ public class Browser extends MessageRunner implements Player<InternetSong>
@Override
public QueryFuture<Void> play()
{
return null;
try
{
return new ForwardedFuture(this.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PLAY)));
}
catch (IOException e)
{
logger.error("Could not send message", e);
return null;
}
}
@Override
public QueryFuture<Void> pause()
{
return null;
try
{
return new ForwardedFuture(this.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PAUSE)));
}
catch (IOException e)
{
logger.error("Could not send message", e);
return null;
}
}
@Override
public QueryFuture<Void> togglePlayback()
{
return null;
try
{
return new ForwardedFuture(this.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PAUSE)));
}
catch (IOException e)
{
logger.error("Could not send message", e);
return null;
}
}
/**
@@ -263,7 +307,15 @@ public class Browser extends MessageRunner implements Player<InternetSong>
@Override
public QueryFuture<Void> seek(float time)
{
return null;
try
{
return new ForwardedFuture(this.sendObject(new CommandSeek(time)));
}
catch (IOException e)
{
logger.error("Could not send message", e);
return null;
}
}
/**
@@ -274,7 +326,71 @@ public class Browser extends MessageRunner implements Player<InternetSong>
@Override
public QueryFuture<PlaybackStatus> getStatus()
{
return null;
try
{
Future future = this.sendObject(new QueryStatus());
return new QueryFuture<>() {
private CommandReturn<Double> getVal() throws ExecutionException, InterruptedException
{
return ((CommandReturn<Double>) future.get());
}
private CommandReturn<Double> getVal(long timeout, TimeUnit unit) throws ExecutionException, InterruptedException, TimeoutException
{
return ((CommandReturn<Double>) future.get(timeout, unit));
}
@Override
public CommandConfirmation getConfirmation() throws CancellationException, ExecutionException, InterruptedException
{
return this.getVal().getConfirmation();
}
@Override
public CommandConfirmation getConfirmation(long timeout, TimeUnit unit) throws ExecutionException, InterruptedException, TimeoutException
{
return this.getVal(timeout, unit).getConfirmation();
}
@Override
public boolean cancel(boolean mayInterruptIfRunning)
{
return future.cancel(mayInterruptIfRunning);
}
@Override
public boolean isCancelled()
{
return future.isCancelled();
}
@Override
public boolean isDone()
{
return future.isDone();
}
@Override
public PlaybackStatus get() throws InterruptedException, ExecutionException
{
Double value = getVal().getReturnValue();
return PlaybackStatus.values()[value.intValue()];
}
@Override
public PlaybackStatus get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
{
Double value = getVal(timeout, unit).getReturnValue();
return PlaybackStatus.values()[value.intValue()];
}
};
}
catch (IOException e)
{
logger.error("Could not send message", e);
return null;
}
}
@Override

8
interface/src/main/java/edu/regis/universeplayer/localPlayer/LocalPlayer.java
View File

@@ -4,7 +4,6 @@
package edu.regis.universeplayer.localPlayer;
import com.intervigil.wave.WaveReader;
import edu.regis.universeplayer.PlaybackListener;
import edu.regis.universeplayer.PlaybackStatus;
import edu.regis.universeplayer.Player;
@@ -12,6 +11,8 @@ import edu.regis.universeplayer.browserCommands.CommandConfirmation;
import edu.regis.universeplayer.browserCommands.QueryFuture;
import edu.regis.universeplayer.data.LocalSong;
import edu.regis.universeplayer.data.Song;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
import uk.co.caprica.vlcj.media.MediaRef;
import uk.co.caprica.vlcj.media.TrackType;
@@ -19,17 +20,12 @@ import uk.co.caprica.vlcj.player.base.MediaPlayer;
import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
import uk.co.caprica.vlcj.player.base.StatusApi;
import uk.co.caprica.vlcj.player.component.AudioPlayerComponent;
import uk.co.caprica.vlcj.player.component.EmbeddedMediaPlayerComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.*;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedList;
import java.util.concurrent.*;

74
interface/src/main/java/edu/regis/universeplayer/player/Interface.java
View File

@@ -6,6 +6,7 @@ package edu.regis.universeplayer.player;
import edu.regis.universeplayer.Player;
import edu.regis.universeplayer.browser.Browser;
import edu.regis.universeplayer.browser.InternetSong;
import edu.regis.universeplayer.data.Queue;
import edu.regis.universeplayer.data.*;
import edu.regis.universeplayer.localPlayer.LocalPlayer;
@@ -36,6 +37,7 @@ public class Interface extends JFrame implements SongDisplayListener, ComponentL
private static final Logger logger = LoggerFactory.getLogger(Interface.class);
private static File dataDir;
private static File commDir;
private static File configDir;
/**
@@ -94,29 +96,32 @@ public class Interface extends JFrame implements SongDisplayListener, ComponentL
inter.players.add(browser = Browser.createBrowser());
browserThread = new Thread(browser);
browserThread.start();
logger.debug("Sending ping");
browser.sendObject("ping");
Runtime.getRuntime().addShutdownHook(new Thread(browser::close));
Player.REGISTERED_PLAYERS.put(InternetSong.class, browser);
LinkedList<Future<Object>> pingRequests = new LinkedList<>();
for (int i = 0; i < 20; i++)
{
logger.info("Sending ping");
pingRequests.add(browser.sendObject("ping"));
}
LinkedList<Future<Object>> toRemove = new LinkedList<>();
while (pingRequests.size() > 0)
{
for (Future<Object> future : pingRequests)
{
if (future.isDone())
{
logger.info("Receiving {}", future.get());
toRemove.add(future);
}
}
pingRequests.removeAll(toRemove);
toRemove.clear();
}
// LinkedList<Future<Object>> pingRequests = new LinkedList<>();
// for (int i = 0; i < 20; i++)
// {
// logger.info("Sending ping");
// pingRequests.add(browser.sendObject("ping"));
// }
//
// LinkedList<Future<Object>> toRemove = new LinkedList<>();
// while (pingRequests.size() > 0)
// {
// for (Future<Object> future : pingRequests)
// {
// if (future.isDone())
// {
// logger.info("Receiving {}", future.get());
// toRemove.add(future);
// }
// }
// pingRequests.removeAll(toRemove);
// toRemove.clear();
// }
}
catch (IOException e)
{
@@ -173,6 +178,33 @@ public class Interface extends JFrame implements SongDisplayListener, ComponentL
return configDir;
}
/**
* Obtains the directory for memory mapped files
* @return The communications storage directory.
*/
public static File getCommDir()
{
if (commDir == null)
{
commDir = new File(AppDirsFactory.getInstance().getSharedDir("universalmusic", null, null), "comm");
if (!commDir.getParentFile().exists())
{
if (!commDir.getParentFile().mkdir())
{
logger.error("Could not create shared directory {}", commDir.getParent());
}
}
if (!commDir.exists())
{
if (!commDir.mkdir())
{
logger.error("Could not create data directory {}", commDir);
}
}
}
return commDir;
}
/**
* Creates an interface
*/

3
interface/src/main/java/edu/regis/universeplayer/player/PlayerControls.java
View File

@@ -12,6 +12,7 @@ import edu.regis.universeplayer.data.Song;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.*;
import java.awt.*;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
@@ -21,8 +22,6 @@ import java.util.LinkedList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
import javax.swing.*;
/**
* This panel contains the buttons necessary for controlling the playback of audio.
*