diff --git a/ACTIONS.md b/ACTIONS.md index dbbb7e3..e6cf42b 100644 --- a/ACTIONS.md +++ b/ACTIONS.md @@ -1,12 +1,10 @@ # Auto-generated Actions list -Fri 27 Dec 01:02:54 UTC 2019 +Fri 27 Dec 01:05:51 UTC 2019 for branch=feature_shader_midi # Methods - * call_method_name(method_name, argument=None) - * call_parse_method_name(method_name, argument) * change_composite_setting(setting_value) * change_hdmi_settings(setting_value) * change_output_mode(setting_value) @@ -31,12 +29,15 @@ for branch=feature_shader_midi * decrease_shader_param * decrease_speed * decrease_this_param + * disable_feedback + * enable_feedback * enter_on_browser_selection * enter_on_settings_selection * enter_on_shaders_selection * exit_openframeworks * exit_osc_server(unused_addr, args) - * get_callback_for_method(method_name, argument) + * function_off + * function_on * get_midi_status * increase_mix_shader * increase_param_focus @@ -93,6 +94,7 @@ for branch=feature_shader_midi * 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 bcaf4de..636e076 100644 --- a/actions.py +++ b/actions.py @@ -198,6 +198,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))) @@ -312,6 +318,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): diff --git a/dotfiles/generate-list-actions.sh b/dotfiles/generate-list-actions.sh index 9ab24c6..abd63cf 100755 --- a/dotfiles/generate-list-actions.sh +++ b/dotfiles/generate-list-actions.sh @@ -8,7 +8,7 @@ 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/' | sed -e 's/://' | sort -n \ - | grep -v "parserlist\|check_if_should_start_openframeworks\|create_serial_port_process\|__init__\|persist_composite_setting\|receive_detour_info\|_refresh_frame_buffer\|refresh_frame_buffer_and_restart_openframeworks\|run_script\|setup_osc_server\|start_confirm_action\|stop_serial_port_process\|stop_openframeworks_process\|update_capture_settings\|update_config_settings\|update_video_settings\|try_remove_file" + | grep -v "parserlist\|check_if_should_start_openframeworks\|create_serial_port_process\|__init__\|persist_composite_setting\|receive_detour_info\|_refresh_frame_buffer\|refresh_frame_buffer_and_restart_openframeworks\|run_script\|setup_osc_server\|start_confirm_action\|stop_serial_port_process\|stop_openframeworks_process\|update_capture_settings\|update_config_settings\|update_video_settings\|try_remove_file\|get_callback\|call_method_name\|call_parse_method" echo echo "# Dynamic routes"