From 2dd7a5b331b57db5c7aa5bef9540e3e198848060 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 01 Apr 2021 14:04:54 +0000
Subject: [PATCH] weiterspielen (erste Fassung fertig)
---
src/de/uhilger/avdirektor/handler/PlayHandler.java | 100 ++++++++++++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 43 deletions(-)
diff --git a/src/de/uhilger/avdirektor/handler/PlayHandler.java b/src/de/uhilger/avdirektor/handler/PlayHandler.java
index 62d3f14..ce37932 100644
--- a/src/de/uhilger/avdirektor/handler/PlayHandler.java
+++ b/src/de/uhilger/avdirektor/handler/PlayHandler.java
@@ -1,14 +1,48 @@
+/*
+ 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 de.uhilger.avdirektor.App;
+import java.io.File;
import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.io.FileUtils;
/**
+ * 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,54 +54,34 @@
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(
- getParam(map, "titel"), params, getParam(map, "r"), "1");
- logger.log(Level.FINE, antwort);
- return antwort;
- }
-
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"));
params.append(" --timeout ");
params.append(getParam(map, "ti"));
+ String log = getParam(map, "log");
+ if(log != null && log.equalsIgnoreCase("true")) {
+ params.append(" --genlog");
+ }
return params;
}
+ @Override
+ protected String process(HttpExchange t, String params) {
+ if(cmd.equalsIgnoreCase(OMXPlayer.F_PLAY)) {
+ try {
+ FileUtils.deleteDirectory(new File(System.getProperty("omx.wd"), "omx-logs"));
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ }
+ }
+ String antwort = App.getPlayer().abspielen(
+ getParam(map, "titel"), params, getParam(map, "r"), "1");
+ logger.log(Level.FINE, antwort);
+ return antwort;
+ }
+
}
--
Gitblit v1.9.3