Compare commits

...

2 commits

Author SHA1 Message Date
Robin Gareus
945849cfb5
TriggerPage: show newly created tracks
The default argument changed, see 76facc0b13 and 670e1f9025
2022-01-18 16:01:42 +01:00
Ben Loftis
0eb44c3be9 trigger_ui: cancel audition when you drag+drop a clip so you can play with it 2022-01-17 19:47:49 -06:00
3 changed files with 10 additions and 2 deletions

View file

@ -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<Gdk::DragContext> const&)
{
_session->cancel_audition ();
}
void
TriggerClipPicker::cursor_changed ()
{

View file

@ -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<Gdk::DragContext> const&, Gtk::SelectionData&, guint, guint);
void drag_end (Glib::RefPtr<Gdk::DragContext> const&);
void maybe_add_dir (std::string const&);
void audition_selected ();
void audition (std::string const&);

View file

@ -535,7 +535,7 @@ TriggerPage::no_strip_drag_data_received (Glib::RefPtr<Gdk::DragContext> const&
output_chan = session()->master_out()->n_inputs().n_audio();
}
std::list<boost::shared_ptr<AudioTrack> > 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<Gdk::DragContext> const&
Config->get_strict_io () || Profile->get_mixbus (),
boost::shared_ptr<ARDOUR::PluginInfo>(),
(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 ();
}