allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

triggerbox: mostly functional slot swapping system (GUI side)

Browse Source
This commit is contained in:
Paul Davis
2021-12-21 17:36:48 -07:00
parent bd873c6ba1
commit d67f97a754
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/triggerbox_ui.cc
View File

@@ -71,17 +71,11 @@ TriggerEntry::TriggerEntry (Item* item, TriggerReference tr)
play_button->name = string_compose ("playbutton %1", tref.slot);
play_button->show ();
<<<<<<< HEAD
follow_button = new ArdourCanvas::Rectangle (this);
follow_button->set_outline (false);
follow_button->set_fill (true);
follow_button->name = ("slot_selector_button");
follow_button->show ();
=======
play_shape = new ArdourCanvas::Polygon (play_button);
play_shape->name = string_compose ("playshape %1", tref.slot);
play_shape->show ();
>>>>>>> ea5651295d (triggerbox (UI): shared ptrs for everyone, plus indirect references to Triggers from TriggerEntry)
name_button = new ArdourCanvas::Rectangle (this);
name_button->set_outline (true);
@@ -98,6 +92,7 @@ TriggerEntry::TriggerEntry (Item* item, TriggerReference tr)
set_default_colors ();
trigger()->PropertyChanged.connect (trigger_prop_connection, MISSING_INVALIDATOR, boost::bind (&TriggerEntry::prop_change, this, _1), gui_context ());
tref.box.TriggerSwapped.connect (trigger_swap_connection, MISSING_INVALIDATOR, boost::bind (&TriggerEntry::trigger_swap, this, _1), gui_context ());
dynamic_cast<Stripable*> (tref.box.owner ())->presentation_info ().Change.connect (owner_prop_connection, MISSING_INVALIDATOR, boost::bind (&TriggerEntry::owner_prop_change, this, _1), gui_context ());
PropertyChange changed;
@@ -112,6 +107,18 @@ TriggerEntry::~TriggerEntry ()
{
}
void
TriggerEntry::trigger_swap (uint32_t n)
{
if (n != tref.slot) {
/* some other slot in the same box got swapped. we don't care */
return;
}
trigger_prop_connection.disconnect ();
trigger()->PropertyChanged.connect (trigger_prop_connection, MISSING_INVALIDATOR, boost::bind (&TriggerEntry::prop_change, this, _1), gui_context ());
prop_change (Properties::name);
}
void
TriggerEntry::owner_prop_change (PropertyChange const& pc)
{

3
gtk2_ardour/triggerbox_ui.h
View File

@@ -89,8 +89,11 @@ private:
double _poly_margin;
PBD::ScopedConnection trigger_prop_connection;
PBD::ScopedConnection trigger_swap_connection;
void prop_change (PBD::PropertyChange const& change);
void trigger_swap (uint32_t);
PBD::ScopedConnection owner_prop_connection;
void owner_prop_change (PBD::PropertyChange const&);
void owner_color_changed ();