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/handler/CmdHandler.java | 60 +++++++++++++++++++++---------------------------------------
1 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/src/de/uhilger/avdirektor/handler/CmdHandler.java b/src/de/uhilger/avdirektor/handler/CmdHandler.java
index 7e3193e..4a96ec9 100644
--- a/src/de/uhilger/avdirektor/handler/CmdHandler.java
+++ b/src/de/uhilger/avdirektor/handler/CmdHandler.java
@@ -1,10 +1,25 @@
+/*
+ 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.handler;
import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
+import de.uhilger.avdirektor.App;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -12,51 +27,18 @@
*
* @author ulrich
*/
-public class CmdHandler extends OMXPlayer implements HttpHandler {
+public class CmdHandler extends AbstractHandler {
private static final Logger logger = Logger.getLogger(CmdHandler.class.getName());
-
- protected String cmd;
- protected Map map;
public CmdHandler(String cmd) {
this.cmd = cmd;
}
- @Override
- public void handle(HttpExchange t) throws IOException {
- logger.log(Level.FINE, "RequestURI: {0}", t.getRequestURI().toString());
- StringBuilder params = buildParams(t);
- String antwort = process(t, params.toString());
- sendResponse(t, cmd, antwort);
- }
-
protected String process(HttpExchange t, String params) {
- String antwort = this.kommando(cmd);
+ String antwort = App.getPlayer().kommando(cmd);
logger.log(Level.FINE, antwort);
return antwort;
}
- protected StringBuilder buildParams(HttpExchange t) {
- map = getQueryMap(t);
- StringBuilder params = new StringBuilder();
- return params;
- }
-
- protected void sendResponse(HttpExchange t, String cmd, String antwort) throws IOException {
- String response = getResponseString(map, cmd, antwort);
- t.sendResponseHeaders(200, response.length());
- OutputStream os = t.getResponseBody();
- os.write(response.getBytes());
- os.close();
- }
-
- public void setCmd(String cmd) {
- this.cmd = cmd;
- }
-
- public String getCmd(String cmd) {
- return this.cmd;
- }
-
}
--
Gitblit v1.9.3