From 10f4611836879550953323ab821e4400c70a25f2 Mon Sep 17 00:00:00 2001 From: Julien Woillez Date: Sun, 21 Mar 2021 19:45:01 +0100 Subject: [PATCH 1/2] Added Jamulus options to webconf interface. --- lib/audio_config_handler.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/audio_config_handler.py b/lib/audio_config_handler.py index aef4060d..e2954416 100644 --- a/lib/audio_config_handler.py +++ b/lib/audio_config_handler.py @@ -270,6 +270,12 @@ def get(self, errors=None): 'addPanelConfig': zc_config, 'advanced': True } + config['JAMULUS_OPTIONS'] = { + 'type': 'text', + 'title': "Jamulus Options", + 'value': os.environ.get('JAMULUS_OPTIONS',"-n -j"), + 'advanced': True + } if os.environ.get('SOUNDCARD_NAME')!="RBPi Headphones": config['ZYNTHIAN_RBPI_HEADPHONES'] = { From b0c8443aed0dabd41e06e8f4cbdb6f79a7b4fe8f Mon Sep 17 00:00:00 2001 From: Julien Woillez Date: Mon, 22 Mar 2021 11:38:27 +0100 Subject: [PATCH 2/2] Added Jamulus.ini handling when envar not present --- lib/audio_config_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/audio_config_handler.py b/lib/audio_config_handler.py index e2954416..fd099ca4 100644 --- a/lib/audio_config_handler.py +++ b/lib/audio_config_handler.py @@ -273,7 +273,7 @@ def get(self, errors=None): config['JAMULUS_OPTIONS'] = { 'type': 'text', 'title': "Jamulus Options", - 'value': os.environ.get('JAMULUS_OPTIONS',"-n -j"), + 'value': os.environ.get('JAMULUS_OPTIONS',"-n -i /root/Jamulus.ini -c your_favorite_jamulus_address"), 'advanced': True }