From 6ff352870ec1dfea573fb3e6de370f8020fe0d04 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 04 Apr 2021 08:38:03 +0000
Subject: [PATCH] Umgestellt auf nio.FileSystem
---
src/de/uhilger/avdirektor/App.java | 92 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/src/de/uhilger/avdirektor/App.java b/src/de/uhilger/avdirektor/App.java
index 9653669..33906d2 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,46 +39,25 @@
* 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 PI_PLAYER = "pi_player";
- //public static final String FBI_PROC = "fbi_proc";
- public static final String CMD_STOP = "q";
- public static final String CMD_DEC_SPEED = "1";
- public static final String CMD_INC_SPEED = "2";
- public static final String CMD_PREV_AUDIO = "j";
- public static final String CMD_NEXT_AUDIO = "k";
- public static final String CMD_PREV_CHAPTER = "i";
- public static final String CMD_NEXT_CHAPTER = "o";
- public static final String CMD_PREV_SUB = "n";
- public static final String CMD_NEXT_SUB = "m";
- public static final String CMD_TOGGLE_SUB = "s";
- public static final String CMD_PAUSE_RESUME = "p";
- public static final String CMD_DEC_VOL = "-";
- public static final String CMD_INC_VOL = "+";
+ 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";
- public static final String PFEIL_LINKS = "5b44";
- public static final String PFEIL_RECHTS = "5b43";
- public static final String PFEIL_HERAUF = "5b41";
- public static final String PFEIL_HERUNTER = "5b42";
- public static final String SP_RUECK_30 = "rueck30";
- public static final String SP_VOR_30 = "rueck30";
- public static final String SP_VOR_600 = "vor600";
- public static final String SP_RUECK_600 = "rueck600";
-
- public static final String OPT_LOCAL_AUDIO = "-o%20local";
- public static final String OPT_HDMI_AUDIO = "-o hdmi";
-
- public static final String BLANK = " ";
-
- private static HashMap initParams;
-
+ private static HashMap initParams;
private static Process playerproc;
+ private static Player player;
+
/**
* @param args the command line arguments
@@ -65,15 +65,20 @@
public static void main(String[] args) {
initParams = new HashMap();
for(String arg: args) {
- //logger.info("arg: " + arg);
String[] argParts = arg.split("=");
- //logger.info(argParts[0]);
- //logger.info(argParts[1]);
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) {
@@ -101,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