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 /libs/ardour/ardour/session.h | |
| 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 'libs/ardour/ardour/session.h')
| -rw-r--r-- | libs/ardour/ardour/session.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 2c0ac05bda..61f57a6cc6 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1169,10 +1169,15 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void reset_rf_scale (framecnt_t frames_moved); Locations* _locations; - void locations_changed (); - void locations_added (Location*); - void handle_locations_changed (Locations::LocationList&); - void sync_locations_to_skips (Locations::LocationList&); + void location_added (Location*); + void location_removed (Location*); + void locations_changed (); + void _locations_changed (const Locations::LocationList&); + + void update_skips (Location*, bool consolidate); + Locations::LocationList consolidate_skips (Location*); + void sync_locations_to_skips (const Locations::LocationList&); + PBD::ScopedConnectionList skip_connections; PBD::ScopedConnectionList punch_connections; void auto_punch_start_changed (Location *); @@ -1634,7 +1639,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /** true if timecode transmission by the transport is suspended, otherwise false */ mutable gint _suspend_timecode_transmission; - void update_locations_after_tempo_map_change (Locations::LocationList &); + void update_locations_after_tempo_map_change (const Locations::LocationList &); void start_time_changed (framepos_t); void end_time_changed (framepos_t); |