X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Flocation.h;h=6b61dae74631e9b16c85a03a893a01a4f59c2952;hb=11a68f7dd38e72c3e497569a60cb0740a33b78cf;hp=f809dbf280b649ccb91d8ae9706537bc63252835;hpb=f90071113654c5d788e90196db5ee1dedd11172f;p=ardour.git diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index f809dbf280..6b61dae746 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -41,6 +41,7 @@ namespace ARDOUR { class SceneChange; +/** Location on Timeline - abstract representation for Markers, Loop/Punch Ranges, CD-Markers etc. */ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDestructible { public: @@ -61,8 +62,8 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest Location (const Location& other); Location (Session &, const XMLNode&); Location* operator= (const Location& other); - - bool operator==(const Location& other); + + bool operator==(const Location& other); bool locked() const { return _locked; } void lock (); @@ -86,8 +87,8 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest void set_hidden (bool yn, void *src); void set_cd (bool yn, void *src); void set_is_range_marker (bool yn, void* src); - void set_skip (bool yn); - void set_skipping (bool yn); + void set_skip (bool yn); + void set_skipping (bool yn); bool is_auto_punch () const { return _flags & IsAutoPunch; } bool is_auto_loop () const { return _flags & IsAutoLoop; } @@ -105,32 +106,33 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest boost::shared_ptr scene_change() const { return _scene_change; } void set_scene_change (boost::shared_ptr); - /* these are static signals for objects that want to listen to all - locations at once. - */ + /* these are static signals for objects that want to listen to all + locations at once. + */ static PBD::Signal1 name_changed; static PBD::Signal1 end_changed; static PBD::Signal1 start_changed; static PBD::Signal1 flags_changed; - static PBD::Signal1 lock_changed; + static PBD::Signal1 lock_changed; static PBD::Signal1 position_lock_style_changed; /* this is sent only when both start and end change at the same time */ static PBD::Signal1 changed; - /* these are member signals for objects that care only about - changes to this object - */ + /* these are member signals for objects that care only about + changes to this object + */ + + PBD::Signal0 Changed; PBD::Signal0 NameChanged; PBD::Signal0 EndChanged; PBD::Signal0 StartChanged; - PBD::Signal0 Changed; PBD::Signal0 FlagsChanged; PBD::Signal0 LockChanged; PBD::Signal0 PositionLockStyleChanged; - + /* CD Track / CD-Text info */ std::map cd_info; @@ -143,14 +145,15 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest void set_position_lock_style (PositionLockStyle ps); void recompute_frames_from_bbt (); - static PBD::Signal0 scene_changed; + static PBD::Signal0 scene_changed; /* for use by backend scene change management, class level */ + PBD::Signal0 SceneChangeChanged; /* for use by objects interested in this object */ private: std::string _name; framepos_t _start; - Timecode::BBT_Time _bbt_start; + double _bbt_start; framepos_t _end; - Timecode::BBT_Time _bbt_end; + double _bbt_end; Flags _flags; bool _locked; PositionLockStyle _position_lock_style; @@ -161,6 +164,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest void recompute_bbt_from_frames (); }; +/** A collection of session locations including unique dedicated locations (loop, punch, etc) */ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDestructible { public: @@ -169,7 +173,8 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes Locations (Session &); ~Locations (); - const LocationList& list() { return locations; } + const LocationList& list () const { return locations; } + LocationList list () { return locations; } void add (Location *, bool make_current = false); void remove (Location *); @@ -193,7 +198,7 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes Location* mark_at (framepos_t, framecnt_t slop = 0) const; - framepos_t first_mark_before (framepos_t, bool include_special_ranges = false); + framepos_t first_mark_before (framepos_t, bool include_special_ranges = false); framepos_t first_mark_after (framepos_t, bool include_special_ranges = false); void marks_either_side (framepos_t const, framepos_t &, framepos_t &) const; @@ -202,23 +207,23 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes PBD::Signal1 current_changed; - /* Objects that care about individual addition and removal of Locations should connect to added/removed. - If an object additionally cares about potential mass clearance of Locations, they should connect to changed. - */ + /* Objects that care about individual addition and removal of Locations should connect to added/removed. + If an object additionally cares about potential mass clearance of Locations, they should connect to changed. + */ PBD::Signal1 added; PBD::Signal1 removed; PBD::Signal0 changed; /* emitted when any action that could have added/removed more than 1 location actually removed 1 or more */ template void apply (T& obj, void (T::*method)(const LocationList&)) const { - /* We don't want to hold the lock while the given method runs, so take a copy - of the list and pass that instead. - */ - Locations::LocationList copy; - { - Glib::Threads::Mutex::Lock lm (lock); - copy = locations; - } + /* We don't want to hold the lock while the given method runs, so take a copy + of the list and pass that instead. + */ + Locations::LocationList copy; + { + Glib::Threads::Mutex::Lock lm (lock); + copy = locations; + } (obj.*method)(copy); }