From 60719cc5f0cdc13defcf73eb4a0701ee9b654289 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 25 Mar 2021 09:04:28 +0000
Subject: [PATCH] AGPL Header hinzugefuegt
---
src/de/uhilger/avdirektor/handler/PlayHandler.java | 73 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/de/uhilger/avdirektor/handler/PlayHandler.java b/src/de/uhilger/avdirektor/handler/PlayHandler.java
index 62d3f14..d201d48 100644
--- a/src/de/uhilger/avdirektor/handler/PlayHandler.java
+++ b/src/de/uhilger/avdirektor/handler/PlayHandler.java
@@ -1,14 +1,44 @@
+/*
+ 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 java.util.logging.Level;
import java.util.logging.Logger;
/**
+ * Play
+ *
+ * rpi4-az:9090/avd/play?titel=/Filme/S/sound_city.m4v&th=60&ti=60&o=local
+ *
+ * OMXPlayer.abspielenMitParameternUndRueckmeldung(
+ * String urlStr, String parameter, String meldeUrlStr, String token)
+ *
+ * Parameter des Aufrufs play als query (th threshold, ti timeout)
+ *
+ * ?titel=/Filme/S/sound_city.m4v
+ * &ti=60
+ * &th=60
+ * &o=local|hdmi|both
+ * &r=http://uhilger.de/mc/api/usw
+ *
+ * r muss ganz wegbleiben, wenn keine Rueckmeldung gewuescht ist
*
* @author ulrich
*/
@@ -20,40 +50,9 @@
super(cmd);
}
- /*
- rpi4-az:9090/avd/play?titel=/Filme/S/sound_city.m4v&th=60&ti=60&o=local
-
- OMXPlayer.abspielenMitParameternUndRueckmeldung(
- String urlStr, String parameter, String meldeUrlStr, String token)
-
- Parameter des Aufrufs play als query (th threshold, ti timeout)
-
- ?titel=/Filme/S/sound_city.m4v
- &ti=60
- &th=60
- &o=local|hdmi|both
- &r=http://uhilger.de/mc/api/usw
-
- r muss ganz wegbleiben, wenn keine Rueckmeldung gewuescht ist
-
- */
- /*
- @Override
- public void handle(HttpExchange t) throws IOException {
- logger.log(Level.FINE, "RequestURI: {0}", t.getRequestURI().toString());
-
- StringBuilder params = buildParams(t);
-
- String antwort = abspielenMitParameternUndRueckmeldung(
- getParam(map, "titel"), params.toString(), getParam(map, "r"), "1");
-
- sendResponse(t, "play", antwort);
- }
- */
-
@Override
protected String process(HttpExchange t, String params) {
- String antwort = abspielenMitParameternUndRueckmeldung(
+ String antwort = abspielen(
getParam(map, "titel"), params, getParam(map, "r"), "1");
logger.log(Level.FINE, antwort);
return antwort;
@@ -61,7 +60,7 @@
protected StringBuilder buildParams(HttpExchange t) {
StringBuilder params = super.buildParams(t);
- params.append("-o ");
+ params.append("-b -o ");
params.append(getParam(map, "o"));
params.append(" --threshold ");
params.append(getParam(map, "th"));
--
Gitblit v1.9.3