eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-12 11:20:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

oops, actually fixed, and fix if REMOTE_SERVER is missing from configuration

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-29 13:28:24 +00:00
parent 00aacd5360
commit 391e8aef01
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data_centre/data.py
View File

@@ -69,11 +69,12 @@ class Data(object):
self.shader_bank_data = [self.create_empty_shader_bank() for i in range(3)] 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): 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.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): if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON):
self.settings = self._read_json(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.key_mappings = self._read_json(self.KEYPAD_MAPPING_JSON)
self.osc_mappings = self._read_json(self.OSC_MAPPING_JSON) self.osc_mappings = self._read_json(self.OSC_MAPPING_JSON)

4
user_input/numpad_input.py
View File

@@ -61,9 +61,9 @@ class NumpadInput(object):
print('the action being called is {}'.format(this_mapping[mode][is_function])) print('the action being called is {}'.format(this_mapping[mode][is_function]))
if value != -1: 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: 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': if is_function and self.data.settings['sampler']['FUNC_GATED']['value'] == 'off':
self.data.function_on = False self.data.function_on = False

2
user_input/osc_input.py
View File

@@ -23,6 +23,8 @@ class OscInput(object):
self.poll_settings_for_osc_info() self.poll_settings_for_osc_info()
def poll_settings_for_osc_info(self): 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' osc_setting_enabled = self.data.settings['user_input']['OSC_INPUT']['value'] == 'enabled'
if osc_setting_enabled and not self.osc_enabled: if osc_setting_enabled and not self.osc_enabled:
self.setup_osc_server() self.setup_osc_server()