summaryrefslogtreecommitdiff
path: root/gtk2_ardour/meterbridge.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-07-07 11:58:27 +0200
committerRobin Gareus <robin@gareus.org>2013-07-10 15:27:13 +0200
commit4a9e79e53f0a8064b6fd593c3db6abae34fe295b (patch)
treeeda7ef40f2187750847ffd0faa2327992f1f28e6 /gtk2_ardour/meterbridge.cc
parent3a8f5a9770c61a8546bec905301be3ea0b038c86 (diff)
fix meterbridge metric display switch
Diffstat (limited to 'gtk2_ardour/meterbridge.cc')
-rw-r--r--gtk2_ardour/meterbridge.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index f24f34efc2..6a8819d88e 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -566,7 +566,7 @@ Meterbridge::update_metrics ()
{
bool have_midi = false;
for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
- if ( (*i).s->has_midi () && (*i).visible) {
+ if ( (*i).s->has_midi() && (*i).visible) {
have_midi = true;
break;
}
@@ -581,13 +581,14 @@ Meterbridge::update_metrics ()
void
Meterbridge::sync_order_keys (RouteSortOrderKey src)
{
+ Glib::Threads::Mutex::Lock lm (_resync_mutex);
+
MeterOrderRouteSorter sorter;
- std::list<MeterBridgeStrip> copy (strips);
- copy.sort(sorter);
+ strips.sort(sorter);
int pos = 0;
- for (list<MeterBridgeStrip>::iterator i = copy.begin(); i != copy.end(); ++i) {
+ for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
if (! (*i).s->route()->active()) {
(*i).s->hide();