From 3e5606415f2e419c03c747fca7fa1d4ac7855bec Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Sun, 12 Dec 2021 11:32:38 -0600 Subject: [PATCH] Trigger Cues: implement Stop button (gtk part) --- gtk2_ardour/trigger_master.cc | 2 +- gtk2_ardour/trigger_master.h | 2 +- gtk2_ardour/trigger_page.cc | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc index 2a7985217e..9029537a52 100644 --- a/gtk2_ardour/trigger_master.cc +++ b/gtk2_ardour/trigger_master.cc @@ -360,7 +360,7 @@ CueMaster::event_handler (GdkEvent* ev) switch (ev->type) { case GDK_BUTTON_PRESS: if (ev->button.button == 1) { - //TriggerBox::StopAllTriggers (); + _session->stop_all_triggers(); return true; } break; diff --git a/gtk2_ardour/trigger_master.h b/gtk2_ardour/trigger_master.h index f2312c62dd..147d657712 100644 --- a/gtk2_ardour/trigger_master.h +++ b/gtk2_ardour/trigger_master.h @@ -81,7 +81,7 @@ class TriggerMaster : public ArdourCanvas::Rectangle }; -class CueMaster : public ArdourCanvas::Rectangle +class CueMaster : public ArdourCanvas::Rectangle, public ARDOUR::SessionHandlePtr { public: CueMaster (ArdourCanvas::Item* canvas); diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc index a06076d42c..c736dc19ca 100644 --- a/gtk2_ardour/trigger_page.cc +++ b/gtk2_ardour/trigger_page.cc @@ -218,6 +218,8 @@ TriggerPage::set_session (Session* s) return; } + _master.set_session(s); + XMLNode* node = ARDOUR_UI::instance ()->trigger_page_settings (); set_state (*node, Stateful::loading_state_version);