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/VLCPlayer.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/de/uhilger/calypso/handler/VLCPlayer.java b/src/de/uhilger/calypso/handler/VLCPlayer.java
index 29469c0..c2c1aba 100644
--- a/src/de/uhilger/calypso/handler/VLCPlayer.java
+++ b/src/de/uhilger/calypso/handler/VLCPlayer.java
@@ -1,14 +1,10 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
package de.uhilger.calypso.handler;
+import com.sun.net.httpserver.HttpExchange;
import de.uhilger.calypso.App;
import de.uhilger.calypso.MeldeThread;
-import static de.uhilger.calypso.handler.OMXPlayer.BLANK;
import java.io.IOException;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -16,9 +12,15 @@
*
* @author ulrich
*/
-public class VLCPlayer implements Player {
+public class VLCPlayer extends BasePlayer implements Player {
private static final Logger logger = Logger.getLogger(VLCPlayer.class.getName());
+
+ public static final String CMD_STOP = "s";
+ public static final String DBUS_PREFIX = "dbus-send --type=method_call --dest=org.mpris.MediaPlayer2.vlc /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.";
+ public static final String CMD_PAUSE_RESUME = "PlayPause";
+ public static final String CMD_SEEK = "Seek";
+ public static final String CMD_VOLUME = "Volume";
@Override
public String abspielen(String urlStr, String parameter, String meldeUrlStr, String token) {
@@ -58,6 +60,7 @@
kommando.append(urlStr);
}
+ kommando.append(" vlc://quit");
logger.log(Level.FINE, "kommando: {0}", kommando.toString());
Process player_process = Runtime.getRuntime().exec(kommando.toString());
if(meldeUrlStr != null) {
@@ -79,9 +82,10 @@
return antwort;
}
- @Override
+
+ /*
public String kommando(String k) {
- if(k.equalsIgnoreCase(OMXPlayer.CMD_STOP)) {
+ if(k.equalsIgnoreCase(VLCPlayer.CMD_STOP)) {
Process p = App.getPlayerProcess();
p.destroy();
App.setPlayerProcess(null);
@@ -89,15 +93,12 @@
String antwort = "Kommando '" + k + "' ausgefuehrt.";
return antwort;
}
+*/
@Override
- public void prozessBeendet(String meldeUrlStr) {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ public StringBuilder buildParams(HttpExchange t, Map m) {
+ return new StringBuilder();
}
- @Override
- public String tilgen() {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
- }
-
+
}
--
Gitblit v1.9.3