diff --git a/actions.py b/actions.py index 7c7bba3..ff4d434 100644 --- a/actions.py +++ b/actions.py @@ -382,8 +382,10 @@ class Actions(object): self.check_if_should_start_openframeworks() elif state == 'omxplayer': self.exit_openframeworks() - self.video_driver.reset_all_players() + self.reset_players() + def reset_players(self): + self.video_driver.reset_all_players() def change_composite_setting(self, setting_value): mode = self.data.settings['video']['COMPOSITE_TYPE']['value'] diff --git a/display_centre/menu.py b/display_centre/menu.py index 33aa7fb..5c2fba1 100644 --- a/display_centre/menu.py +++ b/display_centre/menu.py @@ -115,11 +115,13 @@ class BrowserMenu(Menu): class SettingsMenu(Menu): - FOLDER_ORDER = ['recur', 'video', 'incur', 'captur', 'conjur', 'detour', 'other' ] - SAMPLER_ORDER = ['LOAD_NEXT', 'RAND_START_MODE', 'FIXED_LENGTH_MODE', 'FIXED_LENGTH' ] + FOLDER_ORDER = ['video', 'recur', 'incur', 'captur', 'conjur', 'detour', 'other' ] + RECUR_ORDER = ['LOAD_NEXT', 'RAND_START_MODE', 'FIXED_LENGTH_MODE', 'FIXED_LENGTH' ] VIDEO_ORDER = ['OUTPUT', 'SCREEN_MODE'] - MIDI_ORDER = ['INPUT', 'STATUS'] - CAPTURE_ORDER = ['DEVICE'] + INCUR_ORDER = ['MIDI_INPUT', 'MIDI_STATUS', 'CYCLE_MIDI_PORT'] + CAPTUR_ORDER = ['DEVICE'] + CONJUR_ORDER = ['VIDEO_BACKEND'] + DETOUR_ORDER = [] OTHER_ORDER = [] def __init__(self, data, message_handler, menu_height): diff --git a/json_objects/settings_default.json b/json_objects/settings_default.json index d3ae037..89b6f6a 100644 --- a/json_objects/settings_default.json +++ b/json_objects/settings_default.json @@ -75,7 +75,7 @@ "no" ], "value": "no" - }, + } }, "incur": { "MIDI_CHANNEL": { @@ -126,7 +126,7 @@ "disabled" ], "value": "disabled" - }, + } }, "other": { "UPDATE_CODE": { @@ -211,6 +211,11 @@ ], "value": "off" }, + "RESET_PLAYERS": { + "action": "reset_players", + "options": [], + "value": null + }, "LOOP_TYPE": { "action": "update_video_settings", "options": [ diff --git a/shader_experiments/Shaders/generate/colour_sine.frag b/shader_experiments/Shaders/0-input/colour_sine.frag similarity index 100% rename from shader_experiments/Shaders/generate/colour_sine.frag rename to shader_experiments/Shaders/0-input/colour_sine.frag diff --git a/shader_experiments/Shaders/generate/flowing_colours.frag b/shader_experiments/Shaders/0-input/flowing_colours.frag similarity index 100% rename from shader_experiments/Shaders/generate/flowing_colours.frag rename to shader_experiments/Shaders/0-input/flowing_colours.frag diff --git a/shader_experiments/Shaders/generate/hypnotic_rings.frag b/shader_experiments/Shaders/0-input/hypnotic_rings.frag similarity index 100% rename from shader_experiments/Shaders/generate/hypnotic_rings.frag rename to shader_experiments/Shaders/0-input/hypnotic_rings.frag diff --git a/shader_experiments/Shaders/generate/squarewaves.frag b/shader_experiments/Shaders/0-input/squarewaves.frag similarity index 100% rename from shader_experiments/Shaders/generate/squarewaves.frag rename to shader_experiments/Shaders/0-input/squarewaves.frag diff --git a/shader_experiments/Shaders/generate/zoom_clouds.frag b/shader_experiments/Shaders/0-input/zoom_clouds.frag similarity index 100% rename from shader_experiments/Shaders/generate/zoom_clouds.frag rename to shader_experiments/Shaders/0-input/zoom_clouds.frag diff --git a/shader_experiments/Shaders/process/gray_divisions.frag b/shader_experiments/Shaders/1-input/gray_divisions.frag similarity index 100% rename from shader_experiments/Shaders/process/gray_divisions.frag rename to shader_experiments/Shaders/1-input/gray_divisions.frag diff --git a/shader_experiments/Shaders/process/hsv_control.frag b/shader_experiments/Shaders/1-input/hsv_control.frag similarity index 100% rename from shader_experiments/Shaders/process/hsv_control.frag rename to shader_experiments/Shaders/1-input/hsv_control.frag diff --git a/shader_experiments/Shaders/process/invert_effect.frag b/shader_experiments/Shaders/1-input/invert_effect.frag similarity index 100% rename from shader_experiments/Shaders/process/invert_effect.frag rename to shader_experiments/Shaders/1-input/invert_effect.frag diff --git a/shader_experiments/Shaders/process/kaleidoscope.frag b/shader_experiments/Shaders/1-input/kaleidoscope.frag similarity index 100% rename from shader_experiments/Shaders/process/kaleidoscope.frag rename to shader_experiments/Shaders/1-input/kaleidoscope.frag diff --git a/shader_experiments/Shaders/process/mirror.frag b/shader_experiments/Shaders/1-input/mirror.frag similarity index 100% rename from shader_experiments/Shaders/process/mirror.frag rename to shader_experiments/Shaders/1-input/mirror.frag diff --git a/shader_experiments/Shaders/process/s-wobble.frag b/shader_experiments/Shaders/1-input/s-wobble.frag similarity index 100% rename from shader_experiments/Shaders/process/s-wobble.frag rename to shader_experiments/Shaders/1-input/s-wobble.frag diff --git a/shader_experiments/Shaders/process/simple_colorizer.frag b/shader_experiments/Shaders/1-input/simple_colorizer.frag similarity index 100% rename from shader_experiments/Shaders/process/simple_colorizer.frag rename to shader_experiments/Shaders/1-input/simple_colorizer.frag diff --git a/shader_experiments/Shaders/process/wobble.frag b/shader_experiments/Shaders/1-input/wobble.frag similarity index 100% rename from shader_experiments/Shaders/process/wobble.frag rename to shader_experiments/Shaders/1-input/wobble.frag diff --git a/user_input/analog_input.py b/user_input/analog_input.py index 481a89a..f2a05c4 100644 --- a/user_input/analog_input.py +++ b/user_input/analog_input.py @@ -16,7 +16,7 @@ class AnalogInput(object): def check_if_listening_enabled(self): - if self.data.settings['incur']ANALOG_INPUT']['value'] == 'enabled': + if self.data.settings['incur']['ANALOG_INPUT']['value'] == 'enabled': if not self.analog_input: try: ## note - using software spi for now although on the same pins as the hardware spi described below because hardware spi wasnt working with lcd display @@ -36,7 +36,7 @@ class AnalogInput(object): self.root.after(1000, self.check_if_listening_enabled) def poll_analog_inputs(self): - if self.data.settings['incur']ANALOG_INPUT']['value'] == 'enabled': + if self.data.settings['incur']['ANALOG_INPUT']['value'] == 'enabled': for i in range(0,8): if str(i) in self.analog_mappings: