From aaed2d146028ba1488a7ba7c7e924192b9df8394 Mon Sep 17 00:00:00 2001
From: undisclosed
Date: Mon, 02 Jan 2023 08:58:15 +0000
Subject: [PATCH] Kommentare ergaenzt
---
src/de/uhilger/calypso/Server.java | 87 ++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/src/de/uhilger/calypso/Server.java b/src/de/uhilger/calypso/Server.java
index 6a11452..df18287 100644
--- a/src/de/uhilger/calypso/Server.java
+++ b/src/de/uhilger/calypso/Server.java
@@ -1,6 +1,6 @@
/*
- AV-Direktor - Control OMXPlayer on Raspberry Pi via HTTP
- Copyright (C) 2021 Ulrich Hilger
+ Calypso - Media Player Remote Control via HTTP for Raspberry Pi
+ Copyright (C) 2021-2023 Ulrich Hilger
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
@@ -15,11 +15,12 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-
package de.uhilger.calypso;
import com.sun.net.httpserver.HttpServer;
+import de.uhilger.calypso.handler.BasePlayer;
import de.uhilger.calypso.handler.CmdHandler;
+import de.uhilger.calypso.handler.DBusHandler;
import de.uhilger.calypso.handler.FileHandler;
import de.uhilger.calypso.handler.LogHandler;
import de.uhilger.calypso.handler.OMXPlayer;
@@ -28,58 +29,92 @@
import de.uhilger.calypso.handler.PlayOnHandler;
import de.uhilger.calypso.handler.SeekHandler;
import de.uhilger.calypso.handler.StopServerHandler;
+import de.uhilger.calypso.handler.VLCKillHandler;
+import de.uhilger.calypso.handler.VLCPlayer;
+import de.uhilger.calypso.handler.VLCSeekHandler;
import java.io.IOException;
import java.util.logging.Logger;
import java.net.InetSocketAddress;
import java.util.concurrent.Executors;
+import java.util.logging.Level;
/**
- *
- * @author ulrich
+ * Die Klasse Server implementiert die HTTP-Schnittstelle zum
+ * Mediaplayer. Es wird ein Player-Prozesss fuer das Abspielen
+ * eines Titels gestartet. Mit Stopp oder Ende des Titels endet
+ * auch der Abspielprozess.<br>
+ * <br>
+ * zum Abspielen:<br>
+ * /calypso/play?title=http://ein.titel.mp3&r=http://rueckmelde.url<br>
+ * <br>
+ * waehrend des Abspielens:<br>
+ * /calypso/pause<br>
+ * /calypso/seek?pos=[sekunden]<br>
+ * /calypso/stop<br>
+ * <br>
+ * sonstige Funktionen:<br>
+ * /calypso/ping<br>
+ * /calypso/server/stop<br>
+ * <br>
+ * verworfene Funktionen<br>
+ * /calypso/vol-inc<br>
+ * /calypso/vol-dec<br>
+ * Die Lautstaerke wird in aller Regel am Geraet geregelt, an das der
+ * Zuspieler (der Raspi) angeschlossen ist. Eine Regelung ueber den
+ * Zuspieler ist daher eher selten erforderlich.
+ *
+ * @author Ulrich Hilger
*/
public class Server {
-
+
private static final Logger logger = Logger.getLogger(Server.class.getName());
private int port;
-
+
private String contextName;
-
+
public Server(int port) {
this.port = port;
}
-
+
public void setPort(int port) {
this.port = port;
}
-
+
/**
- *
+ *
* @param contextName e.g. '/calypso' or '/cal'
*/
public void setContextName(String contextName) {
this.contextName = contextName;
}
-
- public void start() throws IOException {
- logger.info("Server starting on port " + port);
+
+ public void start(String playerType) throws IOException {
+ logger.log(Level.INFO, "Server starting on port {0}", port);
HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
- server.createContext(contextName + "/play", new PlayHandler(OMXPlayer.F_PLAY));
- server.createContext(contextName + "/seek", new SeekHandler(OMXPlayer.F_SEEK));
- server.createContext(contextName + "/stop", new CmdHandler(OMXPlayer.CMD_STOP));
- server.createContext(contextName + "/pause", new CmdHandler(OMXPlayer.CMD_PAUSE_RESUME));
- server.createContext(contextName + "/vol-inc", new CmdHandler(OMXPlayer.CMD_INC_VOL));
- server.createContext(contextName + "/vol-dec", new CmdHandler(OMXPlayer.CMD_DEC_VOL));
- server.createContext(contextName + "/info", new CmdHandler(OMXPlayer.CMD_TOGGLE_INFO));
- server.createContext(contextName + "/ping", new PingHandler(OMXPlayer.F_PING));
- server.createContext(contextName + "/server/stop", new StopServerHandler());
- server.createContext(contextName + "/log", new LogHandler());
- server.createContext(contextName + "/playon", new PlayOnHandler(OMXPlayer.F_PLAY_ON));
+ server.createContext(contextName + "/play", new PlayHandler(BasePlayer.F_PLAY));
+ if (playerType.equals(App.OMX_PLAYER)) {
+ server.createContext(contextName + "/seek", new SeekHandler(OMXPlayer.F_SEEK));
+ server.createContext(contextName + "/stop", new CmdHandler(OMXPlayer.CMD_STOP));
+ server.createContext(contextName + "/pause", new CmdHandler(OMXPlayer.CMD_PAUSE_RESUME));
+ server.createContext(contextName + "/vol-inc", new CmdHandler(OMXPlayer.CMD_INC_VOL));
+ server.createContext(contextName + "/vol-dec", new CmdHandler(OMXPlayer.CMD_DEC_VOL));
+ server.createContext(contextName + "/info", new CmdHandler(OMXPlayer.CMD_TOGGLE_INFO));
+ server.createContext(contextName + "/log", new LogHandler());
+ server.createContext(contextName + "/playon", new PlayOnHandler(OMXPlayer.F_PLAY_ON));
+ } else if (playerType.equals(App.VLC_PLAYER)) {
+ server.createContext(contextName + "/pause", new DBusHandler(VLCPlayer.CMD_PAUSE_RESUME));
+ //server.createContext(contextName + "/seek", new DBusHandler(VLCPlayer.CMD_SEEK));
+ server.createContext(contextName + "/seek", new VLCSeekHandler(VLCPlayer.CMD_SEEK));
+ server.createContext(contextName + "/stop", new VLCKillHandler());
+ }
server.createContext(contextName + "/ui", new FileHandler(App.getInitParameter(App.IP_WWW_DATA)));
+ server.createContext(contextName + "/ping", new PingHandler(BasePlayer.F_PING));
+ server.createContext(contextName + "/server/stop", new StopServerHandler());
//server.setExecutor(null); // creates a default executor
server.setExecutor(Executors.newFixedThreadPool(20));
server.start();
- }
+ }
}
--
Gitblit v1.9.3