From 0eb44c3be9a31f3c0f1f6facc720c699042695cc Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 17 Jan 2022 19:47:49 -0600 Subject: [PATCH 1/2] trigger_ui: cancel audition when you drag+drop a clip so you can play with it --- gtk2_ardour/trigger_clip_picker.cc | 7 +++++++ gtk2_ardour/trigger_clip_picker.h | 1 + 2 files changed, 8 insertions(+) diff --git a/gtk2_ardour/trigger_clip_picker.cc b/gtk2_ardour/trigger_clip_picker.cc index 156b164160..19c5625ea2 100644 --- a/gtk2_ardour/trigger_clip_picker.cc +++ b/gtk2_ardour/trigger_clip_picker.cc @@ -135,6 +135,7 @@ TriggerClipPicker::TriggerClipPicker () _view.signal_row_collapsed ().connect (sigc::mem_fun (*this, &TriggerClipPicker::row_collapsed)); _view.signal_drag_data_get ().connect (sigc::mem_fun (*this, &TriggerClipPicker::drag_data_get)); _view.signal_cursor_changed ().connect (sigc::mem_fun (*this, &TriggerClipPicker::cursor_changed)); + _view.signal_drag_end ().connect (sigc::mem_fun (*this, &TriggerClipPicker::drag_end)); Config->ParameterChanged.connect (_config_connection, invalidator (*this), boost::bind (&TriggerClipPicker::parameter_changed, this, _1), gui_context ()); @@ -316,6 +317,12 @@ TriggerClipPicker::maybe_add_dir (std::string const& dir) * Treeview Callbacks */ +void +TriggerClipPicker::drag_end (Glib::RefPtr const&) +{ + _session->cancel_audition (); +} + void TriggerClipPicker::cursor_changed () { diff --git a/gtk2_ardour/trigger_clip_picker.h b/gtk2_ardour/trigger_clip_picker.h index 0402850115..cf69fd856b 100644 --- a/gtk2_ardour/trigger_clip_picker.h +++ b/gtk2_ardour/trigger_clip_picker.h @@ -56,6 +56,7 @@ private: bool test_expand (Gtk::TreeModel::iterator const&, Gtk::TreeModel::Path const&); void row_collapsed (Gtk::TreeModel::iterator const&, Gtk::TreeModel::Path const&); void drag_data_get (Glib::RefPtr const&, Gtk::SelectionData&, guint, guint); + void drag_end (Glib::RefPtr const&); void maybe_add_dir (std::string const&); void audition_selected (); void audition (std::string const&); From 945849cfb5c901ab9557c338d1f1566a3d4c7ab4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 18 Jan 2022 16:01:13 +0100 Subject: [PATCH 2/2] TriggerPage: show newly created tracks The default argument changed, see 76facc0b13f04188d and 670e1f9025da1b --- gtk2_ardour/trigger_page.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc index f22afaec75..ae19c1c1c1 100644 --- a/gtk2_ardour/trigger_page.cc +++ b/gtk2_ardour/trigger_page.cc @@ -535,7 +535,7 @@ TriggerPage::no_strip_drag_data_received (Glib::RefPtr const& output_chan = session()->master_out()->n_inputs().n_audio(); } std::list > audio_tracks; - audio_tracks = session()->new_audio_track (region->sources().size(), output_chan, 0, 1, region->name(), PresentationInfo::max_order); + audio_tracks = session()->new_audio_track (region->sources().size(), output_chan, 0, 1, region->name(), PresentationInfo::max_order, Normal, true, true); if (!audio_tracks.empty()) { triggerbox = audio_tracks.front()->triggerbox (); } @@ -546,7 +546,7 @@ TriggerPage::no_strip_drag_data_received (Glib::RefPtr const& Config->get_strict_io () || Profile->get_mixbus (), boost::shared_ptr(), (ARDOUR::Plugin::PresetRecord*) 0, - (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order, Normal, true); + (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order, Normal, true, true); if (!midi_tracks.empty()) { triggerbox = midi_tracks.front()->triggerbox (); }