diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-24 12:18:40 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-24 12:18:46 -0400 |
commit | f90071113654c5d788e90196db5ee1dedd11172f (patch) | |
tree | 54e708b10f4df0687db03bda9feb3d16dc83ff38 /gtk2_ardour/editor_markers.cc | |
parent | 2f4a8cf69394d4c6442381297136662af923f577 (diff) |
port changes to ARDOUR::Location and ARDOUR::Locations APIs from Tracks to Ardour.
Fixes deadlocks caused by mutex on Locations list, and clarifies the purposes and uses of the class-level and
object-level change-related signals.
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
-rw-r--r-- | gtk2_ardour/editor_markers.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 5a37fe70cb..0900c7fc18 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -486,7 +486,7 @@ Editor::find_location_from_marker (Marker *marker, bool& is_start) const } void -Editor::refresh_location_display_internal (Locations::LocationList& locations) +Editor::refresh_location_display_internal (const Locations::LocationList& locations) { /* invalidate all */ @@ -496,7 +496,7 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations) /* add new ones */ - for (Locations::LocationList::iterator i = locations.begin(); i != locations.end(); ++i) { + for (Locations::LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { LocationMarkerMap::iterator x; |