X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Flocation.h;h=24ee5639153357bf11a40af07d1299b1f0229a4f;hb=67ba18d15430f3e639d97a8a30717d7ff009bec1;hp=bf8e6634172ddf57167ee97598580654bd916f90;hpb=2e81bab8995cc7a1d52737b43cda0e7c3b9b4557;p=ardour.git diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index bf8e663417..24ee563915 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: @@ -53,15 +54,16 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest IsRangeMarker = 0x20, IsSessionRange = 0x40, IsSkip = 0x80, + IsSkipping = 0x100, /* skipping is active (or not) */ }; Location (Session &); - Location (Session &, framepos_t, framepos_t, const std::string &, Flags bits = Flags(0)); + Location (Session &, framepos_t, framepos_t, const std::string &, Flags bits = Flags(0), const uint32_t sub_num = 0); 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 (); @@ -71,20 +73,22 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest framepos_t end() const { return _end; } framecnt_t length() const { return _end - _start; } - int set_start (framepos_t s, bool force = false, bool allow_bbt_recompute = true); - int set_end (framepos_t e, bool force = false, bool allow_bbt_recompute = true); - int set (framepos_t start, framepos_t end, bool allow_bbt_recompute = true); + int set_start (framepos_t s, bool force = false, bool allow_beat_recompute = true, const uint32_t sub_num = 0); + int set_end (framepos_t e, bool force = false, bool allow_beat_recompute = true, const uint32_t sub_num = 0); + int set (framepos_t start, framepos_t end, bool allow_beat_recompute = true, const uint32_t sub_num = 0); - int move_to (framepos_t pos); + int move_to (framepos_t pos, const uint32_t sub_num); const std::string& name() const { return _name; } - void set_name (const std::string &str) { _name = str; name_changed(this); } + void set_name (const std::string &str); void set_auto_punch (bool yn, void *src); void set_auto_loop (bool yn, void *src); 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); bool is_auto_punch () const { return _flags & IsAutoPunch; } bool is_auto_loop () const { return _flags & IsAutoLoop; } @@ -94,6 +98,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest bool is_session_range () const { return _flags & IsSessionRange; } bool is_range_marker() const { return _flags & IsRangeMarker; } bool is_skip() const { return _flags & IsSkip; } + bool is_skipping() const { return (_flags & IsSkip) && (_flags & IsSkipping); } bool matches (Flags f) const { return _flags & f; } Flags flags () const { return _flags; } @@ -101,17 +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. + */ + static PBD::Signal1 name_changed; static PBD::Signal1 end_changed; static PBD::Signal1 start_changed; - - PBD::Signal1 LockChanged; - PBD::Signal2 FlagsChanged; - PBD::Signal1 PositionLockStyleChanged; + static PBD::Signal1 flags_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 + */ + + PBD::Signal0 Changed; + + PBD::Signal0 NameChanged; + PBD::Signal0 EndChanged; + PBD::Signal0 StartChanged; + PBD::Signal0 FlagsChanged; + PBD::Signal0 LockChanged; + PBD::Signal0 PositionLockStyleChanged; + /* CD Track / CD-Text info */ std::map cd_info; @@ -122,16 +143,17 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest PositionLockStyle position_lock_style() const { return _position_lock_style; } void set_position_lock_style (PositionLockStyle ps); - void recompute_frames_from_bbt (); + void recompute_frames_from_beat (); - 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 _start_beat; framepos_t _end; - Timecode::BBT_Time _bbt_end; + double _end_beat; Flags _flags; bool _locked; PositionLockStyle _position_lock_style; @@ -139,9 +161,10 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest void set_mark (bool yn); bool set_flag_internal (bool yn, Flags flag); - void recompute_bbt_from_frames (); + void recompute_beat_from_frames (const uint32_t sub_num); }; +/** A collection of session locations including unique dedicated locations (loop, punch, etc) */ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDestructible { public: @@ -150,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 *); @@ -174,35 +198,33 @@ 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; void find_all_between (framepos_t start, framepos_t, LocationList&, Location::Flags); - enum Change { - ADDITION, ///< a location was added, but nothing else changed - REMOVAL, ///< a location was removed, but nothing else changed - OTHER ///< something more complicated happened - }; - PBD::Signal1 current_changed; - /** something changed about the location list; the parameter gives some idea as to what */ - PBD::Signal1 changed; - /** a location has been added to the end of the list */ - PBD::Signal1 added; - PBD::Signal1 removed; - PBD::Signal1 StateChanged; - template void apply (T& obj, void (T::*method)(LocationList&)) { - Glib::Threads::Mutex::Lock lm (lock); - (obj.*method)(locations); - } + /* 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. + */ - template void apply (T1& obj, void (T1::*method)(LocationList&, T2& arg), T2& arg) { - Glib::Threads::Mutex::Lock lm (lock); - (obj.*method)(locations, arg); + 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; + } + (obj.*method)(copy); } private: