From f91e3ddf2b15d7d23068d9f3b4aafc1b1b0d910e Mon Sep 17 00:00:00 2001 From: Isaac Shoebottom Date: Thu, 27 Jun 2024 00:03:20 -0300 Subject: [PATCH] Fix stop --- scenes/Omnichord.tscn | 19 +++++++++++++++---- scripts/StopController.gd | 6 ++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/scenes/Omnichord.tscn b/scenes/Omnichord.tscn index 6f4030f..91d8692 100644 --- a/scenes/Omnichord.tscn +++ b/scenes/Omnichord.tscn @@ -31,19 +31,30 @@ anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 offset_left = -262.5 -offset_top = -70.0 +offset_top = -78.0 offset_right = 262.5 -offset_bottom = 70.0 +offset_bottom = 78.0 grow_horizontal = 2 grow_vertical = 2 [node name="Sliders" type="HBoxContainer" parent="App"] layout_mode = 2 -[node name="GridContainer" type="GridContainer" parent="App/Sliders"] +[node name="GridContainer" type="HBoxContainer" parent="App/Sliders"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 4 + +[node name="ChordVolume" type="HSlider" parent="App/Sliders/GridContainer"] layout_mode = 2 -[node name="HSlider" type="HSlider" parent="App/Sliders/GridContainer"] +[node name="NoteVolume" type="HSlider" parent="App/Sliders/GridContainer"] +layout_mode = 2 + +[node name="RhythmVolume" type="HSlider" parent="App/Sliders/GridContainer"] +layout_mode = 2 + +[node name="RhythmTempo" type="HSlider" parent="App/Sliders/GridContainer"] layout_mode = 2 [node name="Buttons" type="HBoxContainer" parent="App"] diff --git a/scripts/StopController.gd b/scripts/StopController.gd index e22f620..27f7614 100644 --- a/scripts/StopController.gd +++ b/scripts/StopController.gd @@ -2,12 +2,18 @@ extends Node # Add asset here var RhythmPlayer: AudioStreamPlayer +var ChordPlayer: AudioStreamPlayer +var NotePlayer: AudioStreamPlayer # Called when the node enters the scene tree for the first time. func _ready(): RhythmPlayer = get_node("/root/Control/RhythmPlayer") + ChordPlayer = get_node("/root/Control/ChordPlayer") + NotePlayer = get_node("/root/Control/NotePlayer") self.pressed.connect(button_pressed) func button_pressed(): # Play chord RhythmPlayer.stop() + ChordPlayer.stop() + NotePlayer.stop()