From 933ccd346f0a38218491e95a0c8dc28ff667db78 Mon Sep 17 00:00:00 2001
From: undisclosed
Date: Sun, 08 Jan 2023 14:03:01 +0000
Subject: [PATCH] Kleinere Anpassungen
---
src/de/uhilger/calypso/neu/MeldeThread.java | 4 +-
src/de/uhilger/calypso/neu/ProzessLauscher.java | 4 +-
src/de/uhilger/calypso/neu/actor/PlayActor.java | 6 +--
src/de/uhilger/calypso/neu/AppProperties.java | 27 +++++++------
src/de/uhilger/calypso/neu/Rueckmelder.java | 18 +++++++++
src/de/uhilger/calypso/neu/http/HttpApi.java | 18 +++++++++
6 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/src/de/uhilger/calypso/neu/AppProperties.java b/src/de/uhilger/calypso/neu/AppProperties.java
index aea7da8..4d32edf 100644
--- a/src/de/uhilger/calypso/neu/AppProperties.java
+++ b/src/de/uhilger/calypso/neu/AppProperties.java
@@ -1,20 +1,21 @@
/*
- Helix - Dateiverwaltung
- 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
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
+ 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.
+ 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/>.
- */
+ 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.calypso.neu;
import java.io.File;
diff --git a/src/de/uhilger/calypso/neu/MeldeThread.java b/src/de/uhilger/calypso/neu/MeldeThread.java
index a8ea023..3f125e9 100644
--- a/src/de/uhilger/calypso/neu/MeldeThread.java
+++ b/src/de/uhilger/calypso/neu/MeldeThread.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
diff --git a/src/de/uhilger/calypso/neu/ProzessLauscher.java b/src/de/uhilger/calypso/neu/ProzessLauscher.java
index 6adff11..73c13b8 100644
--- a/src/de/uhilger/calypso/neu/ProzessLauscher.java
+++ b/src/de/uhilger/calypso/neu/ProzessLauscher.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
diff --git a/src/de/uhilger/calypso/neu/Rueckmelder.java b/src/de/uhilger/calypso/neu/Rueckmelder.java
index 1680653..0f4cfe3 100644
--- a/src/de/uhilger/calypso/neu/Rueckmelder.java
+++ b/src/de/uhilger/calypso/neu/Rueckmelder.java
@@ -1,3 +1,21 @@
+/*
+ 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
+ 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.calypso.neu;
import java.io.IOException;
diff --git a/src/de/uhilger/calypso/neu/actor/PlayActor.java b/src/de/uhilger/calypso/neu/actor/PlayActor.java
index d8a7a67..d060ffb 100644
--- a/src/de/uhilger/calypso/neu/actor/PlayActor.java
+++ b/src/de/uhilger/calypso/neu/actor/PlayActor.java
@@ -54,12 +54,10 @@
o = parameter.get("titel");
if (o instanceof String) {
String titel = (String) o;
+ kommando.append("mpv --input-ipc-server=/tmp/mpvsocket --no-terminal ");
if (titel.toLowerCase().endsWith(".mp3")) {
- kommando.append("mpv --input-ipc-server=/tmp/mpvsocket --no-terminal --vo=null ");
- } else {
- kommando.append("mpv --input-ipc-server=/tmp/mpvsocket --no-terminal ");
+ kommando.append("--vo=null ");
}
- kommando.append(Server.BLANK);
kommando.append(titel);
Logger.getLogger(PlayActor.class.getName()).log(Level.FINE, kommando.toString());
Process player_process;
diff --git a/src/de/uhilger/calypso/neu/http/HttpApi.java b/src/de/uhilger/calypso/neu/http/HttpApi.java
index ed87d17..b6ce1ff 100644
--- a/src/de/uhilger/calypso/neu/http/HttpApi.java
+++ b/src/de/uhilger/calypso/neu/http/HttpApi.java
@@ -1,3 +1,21 @@
+/*
+ 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
+ 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.calypso.neu.http;
import com.sun.net.httpserver.HttpExchange;
--
Gitblit v1.9.3