From 391e8aef01ac9b5044b8e7ecff88d456b1caf4b1 Mon Sep 17 00:00:00 2001 From: Tristan Rowley Date: Sat, 29 Feb 2020 13:28:24 +0000 Subject: [PATCH] oops, actually fixed, and fix if REMOTE_SERVER is missing from configuration --- data_centre/data.py | 5 +++-- user_input/numpad_input.py | 4 ++-- user_input/osc_input.py | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/data_centre/data.py b/data_centre/data.py index 6155572..236e4db 100644 --- a/data_centre/data.py +++ b/data_centre/data.py @@ -69,11 +69,12 @@ class Data(object): self.shader_bank_data = [self.create_empty_shader_bank() for i in range(3)] if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SHADER_BANK_DATA_JSON): self.shader_bank_data = self._read_json(self.SHADER_BANK_DATA_JSON) - self.settings = self._read_json(self.DEFAULT_SETTINGS_JSON) + self.settings = self.default_settings = self._read_json(self.DEFAULT_SETTINGS_JSON) if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON): self.settings = self._read_json(self.SETTINGS_JSON) - self.settings['user_input']['REMOTE_SERVER']['value'] = 'disabled' # remote server off at boot + self.settings['user_input'].setdefault('REMOTE_SERVER', + self.default_settings['user_input']['REMOTE_SERVER'])['value'] = 'disabled' # remote server off at boot self.key_mappings = self._read_json(self.KEYPAD_MAPPING_JSON) self.osc_mappings = self._read_json(self.OSC_MAPPING_JSON) diff --git a/user_input/numpad_input.py b/user_input/numpad_input.py index aae0d97..dd3c765 100644 --- a/user_input/numpad_input.py +++ b/user_input/numpad_input.py @@ -61,9 +61,9 @@ class NumpadInput(object): print('the action being called is {}'.format(this_mapping[mode][is_function])) if value != -1: - self.actions.call_method_name(this_mapping[mode][is_function])(value) + self.actions.call_method_name(this_mapping[mode][is_function],value) else: - self.actions.call_method_name(this_mapping[mode][is_function])() + self.actions.call_method_name(this_mapping[mode][is_function]) if is_function and self.data.settings['sampler']['FUNC_GATED']['value'] == 'off': self.data.function_on = False diff --git a/user_input/osc_input.py b/user_input/osc_input.py index 01f57ad..80819af 100644 --- a/user_input/osc_input.py +++ b/user_input/osc_input.py @@ -23,6 +23,8 @@ class OscInput(object): self.poll_settings_for_osc_info() def poll_settings_for_osc_info(self): + self.data.settings['user_input'].setdefault('OSC_INPUT', + self.data.default_settings['user_input'].get('OSC_INPUT')) osc_setting_enabled = self.data.settings['user_input']['OSC_INPUT']['value'] == 'enabled' if osc_setting_enabled and not self.osc_enabled: self.setup_osc_server()