diff --git a/json_objects/midi_action_mapping.json b/json_objects/midi_action_mapping.json index 97d5503..192d926 100644 --- a/json_objects/midi_action_mapping.json +++ b/json_objects/midi_action_mapping.json @@ -1,90 +1,109 @@ { - "control_change 1": { + "control_change 0": { "DEFAULT": ["set_the_shader_param_0_continuous"], "NAV_DETOUR": ["set_detour_mix_continuous"] }, - "control_change 2": { + "control_change 1": { "DEFAULT": ["set_the_shader_param_1_continuous"], "NAV_DETOUR": ["set_detour_speed_position_continuous"] }, - "control_change 3": { + "control_change 2": { "DEFAULT": ["set_the_shader_param_2_continuous"], "NAV_DETOUR": ["set_detour_start_continuous"] }, - "control_change 4": { + "control_change 3": { "DEFAULT": ["set_the_shader_param_3_continuous"], "NAV_DETOUR": ["set_detour_end_continuous"] }, - "control_change 5": { + "control_change 4": { "DEFAULT": ["set_the_shader_param_0_continuous"] }, + "control_change 5": { + "DEFAULT": ["set_the_shader_param_1_continuous"] + }, "control_change 6": { - "DEFAULT": ["set_the_shader_param_1_continuous"] + "DEFAULT": ["set_the_shader_param_2_continuous"] }, "control_change 7": { - "DEFAULT": ["set_the_shader_param_2_continuous"] - }, - "control_change 8": { "DEFAULT": ["set_the_shader_param_3_continuous"] }, - "control_change 74": { + "control_change 8": { "DEFAULT": ["set_the_shader_param_0_continuous"] }, - "control_change 71": { + "control_change 9": { "DEFAULT": ["set_the_shader_param_1_continuous"] }, - "control_change 76": { + "control_change 10": { "DEFAULT": ["set_the_shader_param_2_continuous"] }, - "control_change 77": { + "control_change 11": { "DEFAULT": ["set_the_shader_param_3_continuous"] }, "note_on 72": { "NAV_BROWSER": ["move_browser_selection_up"], - "PLAYER": ["seek_back_on_player"], + "DEFAULT": ["seek_back_on_player", "decrease_seek_time"], "NAV_SETTINGS": ["move_settings_selection_up"], - "LENGTH_SET": ["return_to_default_control_mode"] + "NAV_SHADERS": ["move_shaders_selection_up"], + "LENGTH_SET": ["return_to_default_control_mode"], + "CONFIRM": ["return_to_default_control_mode"], + "SHADER_PARAM": ["decrease_this_param", "decrease_shader_param"] }, "note_on 73": { "NAV_BROWSER": ["move_browser_selection_down"], - "PLAYER": ["seek_forward_on_player"], + "DEFAULT": ["seek_forward_on_player", "increase_seek_time"], "NAV_SETTINGS": ["move_settings_selection_down"], - "LENGTH_SET": ["return_to_default_control_mode"] + "NAV_SHADERS": ["move_shaders_selection_down"], + "LENGTH_SET": ["return_to_default_control_mode"], + "CONFIRM": ["return_to_default_control_mode"], + "SHADER_PARAM": ["increase_this_param", "increase_shader_param"] }, "note_on 74": { "NAV_BROWSER": ["enter_on_browser_selection"], - "PLAYER": ["toggle_action_on_player","toggle_show_on_player"], + "DEFAULT": ["toggle_action_on_player","toggle_show_on_player"], "NAV_SETTINGS": ["enter_on_settings_selection"], - "LENGTH_SET": ["record_fixed_length"] + "NAV_SHADERS": ["enter_on_shaders_selection"], + "LENGTH_SET": ["record_fixed_length"], + "SHADER_PARAM": ["return_to_default_control_mode"], + "CONFIRM": ["perform_confirm_action"], + "NAV_DETOUR": ["toggle_detour_play"] }, "note_on 75": { - "DEFAULT": ["switch_to_next_player", "toggle_player_mode"] + "DEFAULT": ["switch_to_next_player", "toggle_player_mode"], + "NAV_DETOUR": ["toggle_detour_record", "toggle_detour_record_loop"] }, "note_on 76": { - "DEFAULT": ["set_playing_sample_start_to_current_duration", "clear_playing_sample_start_time"] + "DEFAULT": ["set_playing_sample_start_to_current_duration", "clear_playing_sample_start_time"], + "SHADER_PARAM": ["decrease_param_focus"], + "NAV_DETOUR": ["decrease_mix_shader"] }, "note_on 77": { - "DEFAULT": ["set_playing_sample_end_to_current_duration", "clear_playing_sample_end_time"] + "DEFAULT": ["set_playing_sample_end_to_current_duration", "clear_playing_sample_end_time"], + "SHADER_PARAM": ["increase_param_focus"], + "NAV_DETOUR": ["increase_mix_shader"] }, "note_on 78": { "DEFAULT": ["toggle_capture_preview", "toggle_capture_recording"]}, "note_on 79": { - "DEFAULT": ["cycle_display_mode"] + "DEFAULT": ["cycle_display_mode", "cycle_display_mode_back"] }, "note_on 80": { "DEFAULT": ["toggle_function"] }, "note_on 81": { - "DEFAULT": ["load_slot_0_into_next_player","previous_bank"] + "DEFAULT": ["load_slot_0_into_next_player","previous_bank"], + "NAV_DETOUR": ["switch_to_detour_0", "set_the_detour_mix_0"] }, "note_on 82": { - "DEFAULT": ["load_slot_1_into_next_player","next_bank"] + "DEFAULT": ["load_slot_1_into_next_player","next_bank"], + "NAV_DETOUR": ["switch_to_detour_1", "set_the_detour_mix_1"] }, "note_on 83": { - "DEFAULT": ["load_slot_2_into_next_player","clear_all_slots"] + "DEFAULT": ["load_slot_2_into_next_player","clear_all_slots"], + "NAV_DETOUR": ["switch_to_detour_2", "clear_this_detour"] }, "note_on 84": { - "DEFAULT": ["load_slot_3_into_next_player"] + "DEFAULT": ["load_slot_3_into_next_player"], + "NAV_DETOUR": ["switch_to_detour_3"] }, "note_on 85": { "DEFAULT": ["load_slot_4_into_next_player"] @@ -93,63 +112,82 @@ "DEFAULT": ["load_slot_5_into_next_player","toggle_screen_mirror"] }, "note_on 87": { - "DEFAULT": ["load_slot_6_into_next_player"] + "DEFAULT": ["load_slot_6_into_next_player","toggle_shaders"] }, "note_on 88": { - "DEFAULT": ["load_slot_7_into_next_player"] + "DEFAULT": ["load_slot_7_into_next_player", "toggle_detour_mode"] }, "note_on 89": { "DEFAULT": ["load_slot_8_into_next_player"] }, "note_on 90": { - "DEFAULT": ["load_slot_9_into_next_player","quit_the_program"] - }, - "note_on 0": { - "NAV_BROWSER": ["move_browser_selection_up"], - "PLAYER": ["seek_back_on_player"], - "NAV_SETTINGS": ["move_settings_selection_up"], - "LENGTH_SET": ["return_to_default_control_mode"] + "DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"] }, "note_on 36": { - "NAV_BROWSER": ["move_browser_selection_down"], - "PLAYER": ["seek_forward_on_player"], - "NAV_SETTINGS": ["move_settings_selection_down"], - "LENGTH_SET": ["return_to_default_control_mode"] + "NAV_BROWSER": ["move_browser_selection_up"], + "DEFAULT": ["seek_back_on_player", "decrease_seek_time"], + "NAV_SETTINGS": ["move_settings_selection_up"], + "NAV_SHADERS": ["move_shaders_selection_up"], + "LENGTH_SET": ["return_to_default_control_mode"], + "CONFIRM": ["return_to_default_control_mode"], + "SHADER_PARAM": ["decrease_this_param", "decrease_shader_param"] }, "note_on 37": { - "NAV_BROWSER": ["enter_on_browser_selection"], - "PLAYER": ["toggle_action_on_player","toggle_show_on_player"], - "NAV_SETTINGS": ["enter_on_settings_selection"], - "LENGTH_SET": ["record_fixed_length"] + "NAV_BROWSER": ["move_browser_selection_down"], + "DEFAULT": ["seek_forward_on_player", "increase_seek_time"], + "NAV_SETTINGS": ["move_settings_selection_down"], + "NAV_SHADERS": ["move_shaders_selection_down"], + "LENGTH_SET": ["return_to_default_control_mode"], + "CONFIRM": ["return_to_default_control_mode"], + "SHADER_PARAM": ["increase_this_param", "increase_shader_param"] }, "note_on 38": { - "DEFAULT": ["switch_to_next_player", "toggle_player_mode"] + "NAV_BROWSER": ["enter_on_browser_selection"], + "DEFAULT": ["toggle_action_on_player","toggle_show_on_player"], + "NAV_SETTINGS": ["enter_on_settings_selection"], + "NAV_SHADERS": ["enter_on_shaders_selection"], + "LENGTH_SET": ["record_fixed_length"], + "SHADER_PARAM": ["return_to_default_control_mode"], + "CONFIRM": ["perform_confirm_action"], + "NAV_DETOUR": ["toggle_detour_play"] }, "note_on 39": { - "DEFAULT": ["set_playing_sample_start_to_current_duration", "clear_playing_sample_start_time"] + "DEFAULT": ["switch_to_next_player", "toggle_player_mode"], + "NAV_DETOUR": ["toggle_detour_record", "toggle_detour_record_loop"] }, "note_on 40": { - "DEFAULT": ["set_playing_sample_end_to_current_duration", "clear_playing_sample_end_time"] + "DEFAULT": ["set_playing_sample_start_to_current_duration", "clear_playing_sample_start_time"], + "SHADER_PARAM": ["decrease_param_focus"], + "NAV_DETOUR": ["decrease_mix_shader"] }, "note_on 41": { - "DEFAULT": ["toggle_capture_preview", "toggle_capture_recording"]}, + "DEFAULT": ["set_playing_sample_end_to_current_duration", "clear_playing_sample_end_time"], + "SHADER_PARAM": ["increase_param_focus"], + "NAV_DETOUR": ["increase_mix_shader"] + }, "note_on 42": { - "DEFAULT": ["cycle_display_mode"] + "DEFAULT": ["toggle_capture_preview", "toggle_capture_recording"]}, + "note_on 79": { + "DEFAULT": ["cycle_display_mode", "cycle_display_mode_back"] }, "note_on 43": { "DEFAULT": ["toggle_function"] }, "note_on 44": { - "DEFAULT": ["load_slot_0_into_next_player","previous_bank"] + "DEFAULT": ["load_slot_0_into_next_player","previous_bank"], + "NAV_DETOUR": ["switch_to_detour_0", "set_the_detour_mix_0"] }, "note_on 45": { - "DEFAULT": ["load_slot_1_into_next_player","next_bank"] + "DEFAULT": ["load_slot_1_into_next_player","next_bank"], + "NAV_DETOUR": ["switch_to_detour_1", "set_the_detour_mix_1"] }, "note_on 46": { - "DEFAULT": ["load_slot_2_into_next_player","clear_all_slots"] + "DEFAULT": ["load_slot_2_into_next_player","clear_all_slots"], + "NAV_DETOUR": ["switch_to_detour_2", "clear_this_detour"] }, "note_on 47": { - "DEFAULT": ["load_slot_3_into_next_player"] + "DEFAULT": ["load_slot_3_into_next_player"], + "NAV_DETOUR": ["switch_to_detour_3"] }, "note_on 48": { "DEFAULT": ["load_slot_4_into_next_player"] @@ -158,16 +196,16 @@ "DEFAULT": ["load_slot_5_into_next_player","toggle_screen_mirror"] }, "note_on 50": { - "DEFAULT": ["load_slot_6_into_next_player"] + "DEFAULT": ["load_slot_6_into_next_player","toggle_shaders"] }, "note_on 51": { - "DEFAULT": ["load_slot_7_into_next_player"] + "DEFAULT": ["load_slot_7_into_next_player", "toggle_detour_mode"] }, "note_on 52": { "DEFAULT": ["load_slot_8_into_next_player"] }, "note_on 53": { - "DEFAULT": ["load_slot_9_into_next_player","quit_the_program"] + "DEFAULT": ["load_slot_9_into_next_player","confirm_shutdown"] } } diff --git a/json_objects/settings_default.json b/json_objects/settings_default.json index 6106e9d..b629557 100644 --- a/json_objects/settings_default.json +++ b/json_objects/settings_default.json @@ -366,7 +366,8 @@ "action": "change_hdmi_settings", "options": [ "preferred", - "CEA 4 HDMI" + "CEA 4 HDMI", + "CEA 17 HDMI" ], "value": "CEA 4 HDMI" }, diff --git a/user_input/numpad_input.py b/user_input/numpad_input.py index 34cdd1f..f4b19ae 100644 --- a/user_input/numpad_input.py +++ b/user_input/numpad_input.py @@ -20,7 +20,7 @@ class NumpadInput(object): def on_key_press(self, event): numpad = list(string.ascii_lowercase[0:19]) - if event.char is '.': + if event.char is '.' or event.char is 'z': self.actions.quit_the_program() if event.char is 's': event.char = self.on_0_key_press() diff --git a/video_centre/shaders.py b/video_centre/shaders.py index 2491b6e..df2c3e5 100644 --- a/video_centre/shaders.py +++ b/video_centre/shaders.py @@ -1,6 +1,7 @@ import display_centre.menu as menu import os + class Shaders(object): MENU_HEIGHT = 10 EMPTY_SHADER = dict(name='none',is_shader=True,shad_type='-',param_number=0,path='-',shad_index=0) @@ -47,7 +48,8 @@ class Shaders(object): return False, '' def determine_shader_type(self, path): - with open(path, 'r') as selected_shader: + #try: + with open(path, 'r', errors='ignore') as selected_shader: shader_text = selected_shader.read() if '//0-input' in shader_text: return '0in' @@ -55,9 +57,11 @@ class Shaders(object): return '1in' elif '//2-input' in shader_text: return '2in' - else: return '-' + #except Exception as e: + #self.message_handler.set_message('INFO', 'cannot inspect shader text') + #return '-' def determine_shader_parameter_number(self, path): max_amount = 4