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 03:10:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature_plugins' into merge_feature_plugins

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-29 15:48:09 +00:00
parent 430190c1b5 86f547204d
commit 39cd18e06b
15 changed files with 104 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
user_input/numpad_input.py
View File

@@ -59,11 +59,11 @@ class NumpadInput(object):
else:
is_function = 0
print('the action being called is {}'.format(this_mapping[mode][is_function]))
print('the numpad action being called is {} (mode is {})'.format(this_mapping[mode][is_function], mode))
if value != -1:
getattr(self.actions, this_mapping[mode][is_function])(value)
self.actions.call_method_name(this_mapping[mode][is_function],value)
else:
getattr(self.actions, 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

7
user_input/osc_input.py
View File

@@ -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()
@@ -50,8 +52,11 @@ class OscInput(object):
this_dispatcher.map("/shaderparam2", self.on_param_osc_input)
this_dispatcher.map("/shaderparam3", self.on_param_osc_input)
this_dispatcher.map("/shutdown", self.exit_osc_server)
#this_dispatcher.map("/*", print)
# this is for accepting any old osc message to allow binding of modulation to osc messages
# TODO: make configurable?
this_dispatcher.map("/*", self.on_param_osc_input)
osc_server.ThreadingOSCUDPServer.allow_reuse_address = True
server = osc_server.ThreadingOSCUDPServer((server_args.ip, server_args.port), this_dispatcher)
server_thread = threading.Thread(target=server.serve_forever)