From 1cc68ad1f169cdbd0573120be44f7e7565aed2b5 Mon Sep 17 00:00:00 2001 From: Tristan Rowley Date: Mon, 23 Dec 2019 19:00:31 +0000 Subject: [PATCH 1/3] added function_on and function_off mappings to enable having 'function/shift' on midi --- actions.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/actions.py b/actions.py index 803fbaf..45cf4c5 100644 --- a/actions.py +++ b/actions.py @@ -197,6 +197,12 @@ class Actions(object): def toggle_function(self): self.data.function_on = not self.data.function_on + def function_on(self): + self.data.function_on = True + + def function_off(self): + self.data.function_on = False + def next_bank(self): self.data.update_bank_number_by_amount(1) print('current bank is {} , the number of banks is {} '.format(self.data.bank_number, len(self.data.bank_data))) From 8b6b21774b784060c71998c406c856c0e51c4d41 Mon Sep 17 00:00:00 2001 From: Tristan Rowley Date: Tue, 24 Dec 2019 13:53:20 +0000 Subject: [PATCH 2/3] Improved auto-generated actions --- ACTIONS.md | 172 ++++++++++++++++++++++++++++++ dotfiles/generate-list-actions.sh | 14 ++- 2 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 ACTIONS.md diff --git a/ACTIONS.md b/ACTIONS.md new file mode 100644 index 0000000..38386f2 --- /dev/null +++ b/ACTIONS.md @@ -0,0 +1,172 @@ +====== Auto-generated Actions list ======\n +Tue 24 Dec 13:53:04 UTC 2019 + +for branch=feature_midi_extra_mappings + + +===== Methods ===== + * change_composite_setting(setting_value): + * change_hdmi_settings(setting_value): + * change_output_mode(setting_value): + * change_piCapture_input(setting_value): + * check_and_set_output_mode_on_boot: + * check_dev_mode: + * check_if_should_start_openframeworks: + * clear_all_slots: + * clear_message: + * clear_playing_sample_end_time: + * clear_playing_sample_start_time: + * clear_shader_bank: + * clear_this_detour: + * confirm_quit: + * confirm_shutdown: + * confirm_switch_dev_mode(state): + * create_serial_port_process: + * cycle_display_mode: + * cycle_display_mode_back: + * cycle_midi_port_index: + * decrease_mix_shader: + * decrease_param_focus: + * decrease_seek_time: + * decrease_shader_param: + * decrease_speed: + * decrease_this_param: + * enter_on_browser_selection: + * enter_on_settings_selection: + * enter_on_shaders_selection: + * exit_openframeworks: + * exit_osc_server(unused_addr, args): + * function_off: + * function_on: + * get_midi_status: + * increase_mix_shader: + * increase_param_focus: + * increase_seek_time: + * increase_shader_param: + * increase_speed: + * increase_this_param: + * __init__(tk, message_handler, data, video_driver, shaders, display, osc_client): + * load_slot_0_into_next_player: + * load_slot_1_into_next_player: + * load_slot_2_into_next_player: + * load_slot_3_into_next_player: + * load_slot_4_into_next_player: + * load_slot_5_into_next_player: + * load_slot_6_into_next_player: + * load_slot_7_into_next_player: + * load_slot_8_into_next_player: + * load_slot_9_into_next_player: + * load_this_detour_shader: + * _load_this_slot_into_next_player(slot): + * map_on_shaders_selection: + * move_browser_selection_down: + * move_browser_selection_up: + * move_settings_selection_down: + * move_settings_selection_up: + * move_shaders_selection_down: + * move_shaders_selection_up: + * next_bank: + * next_shader_layer: + * perform_confirm_action: + * persist_composite_setting(mode, progressive, aspect): + * play_shader_0: + * play_shader_1: + * play_shader_2: + * play_shader_3: + * play_shader_4: + * play_shader_5: + * play_shader_6: + * play_shader_7: + * play_shader_8: + * play_shader_9: + * play_this_shader(number): + * previous_bank: + * previous_shader_layer: + * quit_the_program: + * receive_detour_info(unused_addr, position, start, end, size, speed, mix, memory_full): + * record_fixed_length: + * _refresh_frame_buffer: + * refresh_frame_buffer_and_restart_openframeworks: + * reset_players: + * restart_openframeworks: + * restart_the_program: + * return_to_default_control_mode: + * run_script(script_name, first_argument='', second_argument=''): + * seek_back_on_player: + * seek_forward_on_player: + * set_capture_object(value): + * set_detour_delay_mode(state): + * set_detour_end_continuous(amount): + * set_detour_mix_continuous(amount): + * set_detour_speed_position_continuous(amount): + * set_detour_start_continuous(amount): + * set_fixed_length(value): + * set_playing_sample_end_to_current_duration: + * set_playing_sample_start_to_current_duration: + * set_shader_param_mode: + * set_strobe_amount_continuous(amount): + * set_the_camera_alpha_continuous(amount): + * set_the_camera_colour_u_continuous(amount): + * set_the_camera_colour_v_continuous(amount): + * set_the_current_video_alpha_continuous(amount): + * set_the_detour_mix_0: + * set_the_detour_mix_1: + * set_the_next_video_alpha_continuous(amount): + * set_the_shader_param_0_layer_offset_0_continuous(amount): + * set_the_shader_param_0_layer_offset_1_continuous(amount): + * set_the_shader_param_0_layer_offset_2_continuous(amount): + * set_the_shader_param_0_layer_offset_3_continuous(amount): + * set_the_shader_param_1_layer_offset_0_continuous(amount): + * set_the_shader_param_1_layer_offset_1_continuous(amount): + * set_the_shader_param_1_layer_offset_2_continuous(amount): + * set_the_shader_param_1_layer_offset_3_continuous(amount): + * set_the_shader_param_2_layer_offset_0_continuous(amount): + * set_the_shader_param_2_layer_offset_1_continuous(amount): + * set_the_shader_param_2_layer_offset_2_continuous(amount): + * set_the_shader_param_2_layer_offset_3_continuous(amount): + * set_the_shader_param_3_layer_offset_0_continuous(amount): + * set_the_shader_param_3_layer_offset_1_continuous(amount): + * set_the_shader_param_3_layer_offset_2_continuous(amount): + * set_the_shader_param_3_layer_offset_3_continuous(amount): + * setup_osc_server: + * shutdown_pi: + * start_confirm_action(action_title, message=None): + * stop_openframeworks_process: + * stop_serial_port_process: + * switch_conjur_player_type(value): + * switch_dev_mode(state): + * switch_display_to_hdmi: + * switch_display_to_lcd: + * switch_to_detour_0: + * switch_to_detour_1: + * switch_to_detour_2: + * switch_to_detour_3: + * switch_to_next_player: + * switch_to_this_detour(number): + * switch_video_backend(state): + * toggle_action_on_player: + * toggle_capture_preview: + * toggle_capture_recording: + * toggle_detour_mode: + * toggle_detour_play: + * toggle_detour_record: + * toggle_detour_record_loop: + * toggle_feedback: + * toggle_function: + * toggle_of_screen_size(value): + * toggle_player_mode: + * toggle_play_on_player: + * toggle_screen_mirror: + * toggle_shaders: + * toggle_shader_speed: + * toggle_show_on_player: + * toggle_x3_as_speed: + * toggle_x_autorepeat: + * try_pull_code_and_reset: + * update_capture_settings(setting_value): + * update_config_settings(sdtv_mode, sdtv_aspect): + * update_video_settings(setting_value): + +---- + +Autogenerated by dotfiles/generate-list-actions.sh diff --git a/dotfiles/generate-list-actions.sh b/dotfiles/generate-list-actions.sh index 4c9abfb..a1d0b0b 100755 --- a/dotfiles/generate-list-actions.sh +++ b/dotfiles/generate-list-actions.sh @@ -1,2 +1,14 @@ #!/bin/sh -grep " def " actions.py | sed -e 's/ def //' | sed -e 's/self//' | sed -e 's/(, /(/' | sed -e 's/()//' | sort -n +echo "====== Auto-generated Actions list ======\n" +echo `date` +echo +echo "for branch=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')" +echo +echo + +echo "===== Methods =====" +grep " def " actions.py | grep -v "^#" | sed -e 's/ def //' | sed -e 's/self//' | sed -e 's/(, /(/' | sed -e 's/()//' | sed -e 's/\(.*\)/ *\1/' | sort -n + +echo -e "\n----\n" +echo "Autogenerated by dotfiles/generate-list-actions.sh" + From da564440220d86616226f7e6d3f62e1ff935deed Mon Sep 17 00:00:00 2001 From: Tristan Rowley Date: Fri, 27 Dec 2019 01:01:00 +0000 Subject: [PATCH 3/3] backported enable_feedback and disable_feedback commands --- ACTIONS.md | 5 ++++- actions.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ACTIONS.md b/ACTIONS.md index 1c5fe1e..ce7291b 100644 --- a/ACTIONS.md +++ b/ACTIONS.md @@ -1,6 +1,6 @@ # Auto-generated Actions list -Tue 24 Dec 14:34:29 UTC 2019 +Fri 27 Dec 00:59:08 UTC 2019 for branch=feature_midi_extra_mappings @@ -29,6 +29,8 @@ for branch=feature_midi_extra_mappings * decrease_shader_param * decrease_speed * decrease_this_param + * disable_feedback + * enable_feedback * enter_on_browser_selection * enter_on_settings_selection * enter_on_shaders_selection @@ -92,6 +94,7 @@ for branch=feature_midi_extra_mappings * set_detour_mix_continuous(amount) * set_detour_speed_position_continuous(amount) * set_detour_start_continuous(amount) + * set_feedback_state(state) * set_fixed_length(value) * set_playing_sample_end_to_current_duration * set_playing_sample_start_to_current_duration diff --git a/actions.py b/actions.py index 45cf4c5..67aa44b 100644 --- a/actions.py +++ b/actions.py @@ -314,6 +314,16 @@ class Actions(object): def toggle_feedback(self): print('toggle here') self.data.feedback_active = not self.data.feedback_active + self.set_feedback_state(self.data.feedback_active) + + def enable_feedback(self): + self.set_feedback_state(True) + + def disable_feedback(self): + self.set_feedback_state(False) + + def set_feedback_state(self, state): + self.data.feedback_active = state self.video_driver.osc_client.send_message("/toggle_feedback", self.data.feedback_active) def play_shader_0(self):