smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Tweak meterbridge track reordering -- amend d03574987

Browse source
This commit is contained in:
Robin Gareus 2019-02-16 23:36:59 +01:00
parent 23a98e5f4d
commit 4ee15fa7b3
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/meterbridge.cc
View file

@ -135,8 +135,9 @@ Meterbridge::Meterbridge ()
signal_delete_event().connect (sigc::mem_fun (*this, &Meterbridge::hide_window)); signal_delete_event().connect (sigc::mem_fun (*this, &Meterbridge::hide_window));
signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
MeterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Meterbridge::remove_strip, this, _1), gui_context()); MeterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Meterbridge::remove_strip, this, _1), gui_context());
MeterStrip::MetricChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::resync_order, this), gui_context()); MeterStrip::MetricChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::sync_order_keys, this), gui_context());
MeterStrip::ConfigurationChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::queue_resize, this), gui_context()); MeterStrip::ConfigurationChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::queue_resize, this), gui_context());
PresentationInfo::Change.connect (*this, invalidator (*this), boost::bind (&Meterbridge::resync_order, this, _1), gui_context());
/* work around ScrolledWindowViewport alignment mess Part one */ /* work around ScrolledWindowViewport alignment mess Part one */
Gtk::HBox * yspc = manage (new Gtk::HBox()); Gtk::HBox * yspc = manage (new Gtk::HBox());
@ -440,7 +441,6 @@ Meterbridge::set_session (Session* s)
_session->StateSaved.connect (_session_connections, invalidator (*this), boost::bind (&Meterbridge::update_title, this), gui_context()); _session->StateSaved.connect (_session_connections, invalidator (*this), boost::bind (&Meterbridge::update_title, this), gui_context());
_session->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Meterbridge::parameter_changed, this, _1), gui_context()); _session->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Meterbridge::parameter_changed, this, _1), gui_context());
Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Meterbridge::parameter_changed, this, _1), gui_context()); Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Meterbridge::parameter_changed, this, _1), gui_context());
PresentationInfo::Change.connect (*this, invalidator (*this), boost::bind (&Meterbridge::resync_order, this), gui_context());
if (_visible) { if (_visible) {
show_window(); show_window();
@ -553,7 +553,7 @@ Meterbridge::add_strips (RouteList& routes)
strip = new MeterStrip (_session, route); strip = new MeterStrip (_session, route);
strips.push_back (MeterBridgeStrip(strip)); strips.push_back (MeterBridgeStrip(strip));
route->active_changed.connect (*this, invalidator (*this), boost::bind (&Meterbridge::resync_order, this), gui_context ()); route->active_changed.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this), gui_context ());
meterarea.pack_start (*strip, false, false); meterarea.pack_start (*strip, false, false);
strip->show(); strip->show();
@ -718,9 +718,11 @@ Meterbridge::sync_order_keys ()
} }
void void
Meterbridge::resync_order() Meterbridge::resync_order (PropertyChange what_changed)
{ {
sync_order_keys(); if (what_changed.contains (ARDOUR::Properties::order)) {
sync_order_keys();
}
} }
void void

2
gtk2_ardour/meterbridge.h
View file

@ -81,7 +81,7 @@ private:
void session_going_away (); void session_going_away ();
void sync_order_keys (); void sync_order_keys ();
void resync_order (); void resync_order (PBD::PropertyChange what_changed = ARDOUR::Properties::order);
mutable Glib::Threads::Mutex _resync_mutex; mutable Glib::Threads::Mutex _resync_mutex;
struct MeterBridgeStrip { struct MeterBridgeStrip {