From 2b62f763dfab4ee304abafd5c2df213e735a9c0a Mon Sep 17 00:00:00 2001 From: langolierz Date: Sun, 1 Mar 2020 17:56:55 +0000 Subject: [PATCH] update default midi map --- json_objects/midi_action_mapping.json | 78 +++++++++++++++++---------- user_input/osc_input.py | 2 +- 2 files changed, 51 insertions(+), 29 deletions(-) diff --git a/json_objects/midi_action_mapping.json b/json_objects/midi_action_mapping.json index c55e444..c78617f 100644 --- a/json_objects/midi_action_mapping.json +++ b/json_objects/midi_action_mapping.json @@ -1,47 +1,69 @@ { "control_change 0": { - "DEFAULT": ["set_the_shader_param_0_layer_offset_0_continuous","set_strobe_amount_continuous"], - "NAV_DETOUR": ["set_detour_mix_continuous"] - }, + "DEFAULT": ["set_the_shader_param_0_layer_offset_0_continuous","set_strobe_amount_continuous"], + "NAV_DETOUR": ["set_detour_speed_position_continuous"], + "NAV_WJMX": ["wj_set_position_N:x"], + "NAV_MANI": ["set_variable_A"], + "NAV_LPRC": ["set_automation_speed"], + "NAV_LFO": ["set_lfo_modulation_0_level"], + "NAV_SND": ["sound_set_config_energy_gain"] + }, "control_change 1": { - "DEFAULT": ["set_the_shader_param_1_layer_offset_0_continuous","set_shader_speed_layer_0_amount"], - "NAV_DETOUR": ["set_detour_speed_position_continuous"] - }, + "DEFAULT": ["set_the_shader_param_1_layer_offset_0_continuous","set_shader_speed_layer_0_amount"], + "NAV_DETOUR": ["set_detour_start_continuous"], + "NAV_WJMX": ["wj_set_position_N:y"], + "NAV_MANI": ["f:sin(x*pi):|set_variable_SIN"], + "NAV_LFO": ["set_lfo_modulation_1_level"], + "NAV_SND": ["sound_set_config_energy_threshold"] + }, "control_change 2": { - "DEFAULT": ["set_the_shader_param_2_layer_offset_0_continuous","set_shader_speed_layer_1_amount"], - "NAV_DETOUR": ["set_detour_start_continuous"] - }, + "DEFAULT": ["set_the_shader_param_2_layer_offset_0_continuous","set_shader_speed_layer_1_amount"], + "NAV_DETOUR": ["set_detour_end_continuous"], + "NAV_WJMX": ["wj_set_colour_T:x"], + "NAV_LFO": ["set_lfo_modulation_2_level"] + }, "control_change 3": { - "DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous","set_shader_speed_layer_2_amount"], - "NAV_DETOUR": ["set_detour_end_continuous"] - }, + "DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous","set_shader_speed_layer_2_amount"], + "NAV_WJMX": ["wj_set_colour_T:y"], + "NAV_LFO": ["set_lfo_modulation_3_level"] + }, "control_change 4": { - "DEFAULT": ["set_the_shader_param_0_layer_offset_1_continuous"] - }, + "DEFAULT": ["set_the_shader_param_0_layer_offset_1_continuous","set_param_0_layer_offset_0_modulation_level_continuous"], + "NAV_WJMX": ["wj_set_mix","wj_set_current_modulation_slot_0_level"], + "NAV_LFO": ["set_lfo_speed"], + "NAV_SND": ["sound_set_modulation_energy_slot_0_level"] + }, "control_change 5": { - "DEFAULT": ["set_the_shader_param_1_layer_offset_1_continuous"] - }, + "DEFAULT": ["set_the_shader_param_1_layer_offset_1_continuous","set_param_1_layer_offset_0_modulation_level_continuous"], + "NAV_WJMX": ["wj_set_back_colour:h","wj_set_current_modulation_slot_1_level"], + "NAV_SND": ["sound_set_modulation_energy_slot_1_level"] + }, "control_change 6": { - "DEFAULT": ["set_the_shader_param_2_layer_offset_1_continuous"] - }, + "DEFAULT": ["set_the_shader_param_2_layer_offset_1_continuous","set_param_2_layer_offset_0_modulation_level_continuous"], + "NAV_WJMX": ["wj_set_back_colour:s","wj_set_current_modulation_slot_2_level"], + "NAV_SND": ["sound_set_modulation_energy_slot_2_level"] + }, "control_change 7": { - "DEFAULT": ["set_the_shader_param_3_layer_offset_1_continuous"] - }, + "DEFAULT": ["set_the_shader_param_3_layer_offset_1_continuous","set_param_3_layer_offset_0_modulation_level_continuous"], + "NAV_WJMX": ["wj_set_back_colour:v","wj_set_current_modulation_slot_3_level"], + "NAV_SND": ["sound_set_modulation_energy_slot_3_level"] + }, "control_change 8": { - "DEFAULT": ["set_the_shader_param_0_layer_offset_2_continuous"] - }, + "DEFAULT": ["set_the_shader_param_0_layer_offset_2_continuous"] + }, "control_change 9": { - "DEFAULT": ["set_the_shader_param_1_layer_offset_2_continuous"] - }, + "DEFAULT": ["set_the_shader_param_1_layer_offset_2_continuous"] + }, "control_change 10": { - "DEFAULT": ["set_the_shader_param_2_layer_offset_2_continuous"] - }, + "DEFAULT": ["set_the_shader_param_2_layer_offset_2_continuous"] + }, "control_change 11": { - "DEFAULT": ["set_the_shader_param_3_layer_offset_2_continuous"] - }, + "DEFAULT": ["set_the_shader_param_3_layer_offset_2_continuous"] + }, "control_change 12": { "DEFAULT": ["set_strobe_amount_continuous"] }, + "note_on 72": { "NAV_BROWSER": ["move_browser_selection_up", "move_browser_selection_page_up"], "DEFAULT": ["seek_back_on_player", "decrease_seek_time"], diff --git a/user_input/osc_input.py b/user_input/osc_input.py index ae6db13..82441ef 100644 --- a/user_input/osc_input.py +++ b/user_input/osc_input.py @@ -55,7 +55,7 @@ class OscInput(object): # 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) + #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)