From e27ab178fa3a2f967823c1bfc81951086e15b642 Mon Sep 17 00:00:00 2001
From: undisclosed
Date: Sun, 08 Jan 2023 16:51:38 +0000
Subject: [PATCH] Package-Namen zurueckgesetzt, weitere Anpassungen nachgezogen, Readme erneuert.
---
src/de/uhilger/calypso/App.java | 102 +++++++--------------------------------------------
1 files changed, 14 insertions(+), 88 deletions(-)
diff --git a/src/de/uhilger/calypso/App.java b/src/de/uhilger/calypso/App.java
index 8cf84c5..3c0b07d 100644
--- a/src/de/uhilger/calypso/App.java
+++ b/src/de/uhilger/calypso/App.java
@@ -1,6 +1,6 @@
/*
- AV-Direktor - Control OMXPlayer on Raspberry Pi via HTTP
- Copyright (C) 2021 Ulrich Hilger
+ Calypso - Media Player Remote Control via HTTP for Raspberry Pi
+ Copyright (C) 2021-2023 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
@@ -18,103 +18,29 @@
package de.uhilger.calypso;
-import de.uhilger.calypso.handler.OMXPlayer;
-import de.uhilger.calypso.handler.Player;
-import de.uhilger.calypso.handler.VLCPlayer;
-import java.io.IOException;
+import de.uhilger.calypso.http.Server;
import java.util.HashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
- * Hauptklasse des av-director
- *
- * Aufruf mit
- * java -jar av-director.jar port=9000
- * java -jar av-director.jar nfs-prefix="/media/mc" port=9000
- * java -Djava.util.logging.config.file=logging.properties -jar ..
- *
- * Der Parameter nfs-prefix bewirkt, dass beim Abspielen relative Pfade
- * mit diesem Praefix verbunden werden und setzt voraus, dass auf der
- * Maschine ein NFS-Mount ueber /etc/fstab eingerichtet ist.
- *
- * @author ulrich
- * @version 0.1, 20.03.2021
+ *
+ * @author Ulrich Hilger
*/
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";
- 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
*/
public static void main(String[] args) {
- initParams = new HashMap();
- for(String arg: args) {
- String[] argParts = arg.split("=");
+ HashMap<String, String> initParams = new HashMap();
+ for (String arg : args) {
+ String[] argParts = arg.split(Server.EQUAL);
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();
- } catch (IOException ex) {
- Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex);
- }
+ String conf = initParams.get(Server.CONF);
+ AppProperties einst = new AppProperties();
+ einst.readFile(conf);
+ Server server;
+ server = new Server();
+ server.start(einst);
}
-
- public static void stop() {
- System.exit(0);
- }
-
- public static String getInitParameter(String pname) {
- String param = null;
- Object o = initParams.get(pname);
- if(o != null) {
- param = o.toString();
- }
- return param;
- }
-
- public static Process getPlayerProcess() {
- return playerproc;
- }
-
- 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