From 94c45ccb52cff4fe8e4fc8b31cef9eb16da80c85 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 31 Mar 2021 21:32:43 +0000
Subject: [PATCH] OMXPlayer Log verarbeiten
---
src/de/uhilger/avdirektor/handler/PlayHandler.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/de/uhilger/avdirektor/handler/PlayHandler.java b/src/de/uhilger/avdirektor/handler/PlayHandler.java
index 3a8db5d..aa32fcd 100644
--- a/src/de/uhilger/avdirektor/handler/PlayHandler.java
+++ b/src/de/uhilger/avdirektor/handler/PlayHandler.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;
@@ -38,7 +53,7 @@
@Override
protected String process(HttpExchange t, String params) {
- String antwort = abspielenMitParameternUndRueckmeldung(
+ String antwort = App.getPlayer().abspielen(
getParam(map, "titel"), params, getParam(map, "r"), "1");
logger.log(Level.FINE, antwort);
return antwort;
@@ -46,12 +61,16 @@
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;
}
--
Gitblit v1.9.3