From 438c31692792fcd4045eb6c437eac1a086713460 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 22 Apr 2021 15:39:33 +0000
Subject: [PATCH] Option -b des omxplayer entfernt
---
src/de/uhilger/avdirektor/Server.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/de/uhilger/avdirektor/Server.java b/src/de/uhilger/avdirektor/Server.java
index 7a56d94..69ec5de 100644
--- a/src/de/uhilger/avdirektor/Server.java
+++ b/src/de/uhilger/avdirektor/Server.java
@@ -1,13 +1,37 @@
+/*
+ AV-Direktor - Control OMXPlayer on Raspberry Pi via HTTP
+ Copyright (C) 2021 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
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ 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.avdirektor;
import com.sun.net.httpserver.HttpServer;
+import de.uhilger.avdirektor.handler.CmdHandler;
+import de.uhilger.avdirektor.handler.FileHandler;
+import de.uhilger.avdirektor.handler.LogHandler;
+import de.uhilger.avdirektor.handler.OMXPlayer;
import de.uhilger.avdirektor.handler.PingHandler;
import de.uhilger.avdirektor.handler.PlayHandler;
-import de.uhilger.avdirektor.handler.StopHandler;
+import de.uhilger.avdirektor.handler.PlayOnHandler;
+import de.uhilger.avdirektor.handler.SeekHandler;
import de.uhilger.avdirektor.handler.StopServerHandler;
import java.io.IOException;
import java.util.logging.Logger;
import java.net.InetSocketAddress;
+import java.util.concurrent.Executors;
/**
*
@@ -17,7 +41,6 @@
private static final Logger logger = Logger.getLogger(Server.class.getName());
-
private int port;
public Server(int port) {
@@ -31,16 +54,19 @@
public void start() throws IOException {
logger.info("Server starting on port " + port);
- StopHandler sh = new StopHandler();
- sh.setCmd(App.CMD_STOP);
-
HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
- server.createContext("/avd/play", new PlayHandler());
- server.createContext("/avd/stop", sh);
- server.createContext("/avd/ping", new PingHandler());
+ server.createContext("/avd/play", new PlayHandler(OMXPlayer.F_PLAY));
+ server.createContext("/avd/seek", new SeekHandler(OMXPlayer.F_SEEK));
+ server.createContext("/avd/stop", new CmdHandler(OMXPlayer.CMD_STOP));
+ server.createContext("/avd/pause", new CmdHandler(OMXPlayer.CMD_PAUSE_RESUME));
+ server.createContext("/avd/ping", new PingHandler(OMXPlayer.F_PING));
server.createContext("/avd/server/stop", new StopServerHandler());
- server.setExecutor(null); // creates a default executor
+ server.createContext("/avd/log", new LogHandler());
+ server.createContext("/avd/playon", new PlayOnHandler(OMXPlayer.F_PLAY_ON));
+ server.createContext("/avd/ui", new FileHandler(App.getInitParameter(App.IP_WWW_DATA)));
+ //server.setExecutor(null); // creates a default executor
+ server.setExecutor(Executors.newFixedThreadPool(20));
server.start();
- }
+ }
}
--
Gitblit v1.9.3