From 098eefb772fa398997afeea9bef0cca4f22251f4 Mon Sep 17 00:00:00 2001
From: undisclosed
Date: Fri, 06 Jan 2023 16:42:38 +0000
Subject: [PATCH] Umgestellt auf mkv. Calypso ist nach einigen Erprobungen zur Zeit eher eine Baustelle. Es ist produktiv nutzbar, muss aber nach dem Einbau von mkv um viele unnuetze und teils noch nicht sauber gebaute Dinge bereinigt werden.
---
src/de/uhilger/calypso/handler/PlayHandler.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/de/uhilger/calypso/handler/PlayHandler.java b/src/de/uhilger/calypso/handler/PlayHandler.java
index f11a935..7b09208 100644
--- a/src/de/uhilger/calypso/handler/PlayHandler.java
+++ b/src/de/uhilger/calypso/handler/PlayHandler.java
@@ -55,6 +55,16 @@
super(cmd);
}
+
+ @Override
+ protected StringBuilder buildParams(HttpExchange t) {
+ StringBuilder params = super.buildParams(t);
+ params.append(App.getPlayer().buildParams(t, map));
+ return params;
+ }
+
+
+ /*
protected StringBuilder buildParams(HttpExchange t) {
StringBuilder params = super.buildParams(t);
params.append("-o ");
@@ -69,22 +79,26 @@
}
return params;
}
-
+ */
+
@Override
protected String process(HttpExchange t, String params) {
- if (cmd.equalsIgnoreCase(OMXPlayer.F_PLAY)) {
+ if (cmd.equalsIgnoreCase(BasePlayer.F_PLAY)) {
try {
//FileUtils.deleteDirectory(new File(System.getProperty("omx.wd"), "omx-logs"));
FileSystem fs = FileSystems.getDefault();
Path path = fs.getPath(System.getProperty("omx.wd"), "omx-logs");
- deleteDirectory(path);
+ if(path.toFile().exists()) {
+ deleteDirectory(path);
+ }
//Files.delete(path);
} catch (IOException ex) {
logger.log(Level.SEVERE, null, ex);
}
}
- String antwort = App.getPlayer().abspielen(
- getParam(map, "titel"), params, getParam(map, "r"), "1");
+ Player player = App.getPlayer();
+ String antwort = player.abspielen(
+ player.getParam(map, "titel"), params, player.getParam(map, "r"), "1");
logger.log(Level.FINE, antwort);
return antwort;
}
--
Gitblit v1.9.3