From 438c31692792fcd4045eb6c437eac1a086713460 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 22 Apr 2021 15:39:33 +0000
Subject: [PATCH] Option -b des omxplayer entfernt
---
src/de/uhilger/avdirektor/App.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/de/uhilger/avdirektor/App.java b/src/de/uhilger/avdirektor/App.java
index 917b31c..33906d2 100644
--- a/src/de/uhilger/avdirektor/App.java
+++ b/src/de/uhilger/avdirektor/App.java
@@ -18,6 +18,9 @@
package de.uhilger.avdirektor;
+import de.uhilger.avdirektor.handler.OMXPlayer;
+import de.uhilger.avdirektor.handler.Player;
+import de.uhilger.avdirektor.handler.VLCPlayer;
import java.io.IOException;
import java.util.HashMap;
import java.util.logging.Level;
@@ -45,9 +48,16 @@
public static final String IP_PORT = "port";
public static final String IP_WWW_DATA = "www-data";
public static final String IP_NFS_PREFIX = "nfs-prefix";
+ public static final String IP_PLAYER = "player";
+ public static final String VLC_PLAYER = "vlc";
+ public static final String OMX_PLAYER = "omx";
+ public static final String OMX_WD = "omx.wd";
+
private static HashMap initParams;
private static Process playerproc;
+ private static Player player;
+
/**
* @param args the command line arguments
@@ -59,6 +69,15 @@
initParams.put(argParts[0], argParts[1]);
}
+ String playerType = getInitParameter(IP_PLAYER);
+ switch(playerType) {
+ case VLC_PLAYER:
+ player = new VLCPlayer();
+ break;
+ case OMX_PLAYER:
+ player = new OMXPlayer();
+ break;
+ }
Server server = new Server(Integer.parseInt(getInitParameter(IP_PORT)));
try {
server.start();
@@ -87,4 +106,15 @@
public static void setPlayerProcess(Process p) {
playerproc = p;
}
+
+ public static Player getPlayer() {
+ return player;
+ }
+
+ public static void setPlayer(Player pl) {
+ player = pl;
+ }
+
+
+
}
--
Gitblit v1.9.3