From cfe3676d7c9667824c52bb5e5c782d4a9a89b672 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Mon, 29 Mar 2021 19:16:44 +0000
Subject: [PATCH] VLCPlayer hinzugefuegt
---
src/de/uhilger/avdirektor/App.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/src/de/uhilger/avdirektor/App.java b/src/de/uhilger/avdirektor/App.java
index d4b7035..4831380 100644
--- a/src/de/uhilger/avdirektor/App.java
+++ b/src/de/uhilger/avdirektor/App.java
@@ -1,5 +1,26 @@
+/*
+ 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;
+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;
@@ -18,13 +39,24 @@
* Maschine ein NFS-Mount ueber /etc/fstab eingerichtet ist.
*
* @author ulrich
+ * @version 0.1, 20.03.2021
*/
public class App {
private static final Logger logger = Logger.getLogger(App.class.getName());
+ 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";
+
+
private static HashMap initParams;
private static Process playerproc;
+ private static Player player;
+
/**
* @param args the command line arguments
@@ -35,9 +67,17 @@
String[] argParts = arg.split("=");
initParams.put(argParts[0], argParts[1]);
}
-
-
- Server server = new Server(Integer.parseInt(getInitParameter("port")));
+
+ 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();
} catch (IOException ex) {
@@ -65,4 +105,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