X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Flocation.h;h=6cea208f05014e7af62c40147d758ed7c747aa9a;hb=152935e736eaf06f85bc7f5cb27337a62d95edd4;hp=c0711e0c9bf22f2c87786a72b7cfbbcd8a72a13b;hpb=895bad1dcd817cb8ad32dc255a90271edd6659fb;p=ardour.git diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index c0711e0c9b..6cea208f05 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -27,17 +27,21 @@ #include -#include +#include #include "pbd/undo.h" #include "pbd/stateful.h" #include "pbd/statefuldestructible.h" #include "ardour/ardour.h" +#include "ardour/scene_change.h" +#include "ardour/session_handle.h" namespace ARDOUR { -class Location : public PBD::StatefulDestructible +class SceneChange; + +class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDestructible { public: enum Flags { @@ -50,41 +54,27 @@ class Location : public PBD::StatefulDestructible IsSessionRange = 0x40 }; - Location (nframes64_t sample_start, - nframes64_t sample_end, - const std::string &name, - Flags bits = Flags(0)) - - : _name (name), - _start (sample_start), - _end (sample_end), - _flags (bits), - _locked (false) { } - - Location () { - _start = 0; - _end = 0; - _flags = Flags (0); - _locked = false; - } - + Location (Session &); + Location (Session &, framepos_t, framepos_t, const std::string &, Flags bits = Flags(0)); Location (const Location& other); - Location (const XMLNode&); + Location (Session &, const XMLNode&); Location* operator= (const Location& other); + + bool operator==(const Location& other); bool locked() const { return _locked; } - void lock() { _locked = true; changed (this); } - void unlock() { _locked = false; changed (this); } + void lock (); + void unlock (); - nframes64_t start() const { return _start; } - nframes64_t end() const { return _end; } - nframes64_t length() const { return _end - _start; } + framepos_t start() const { return _start; } + framepos_t end() const { return _end; } + framecnt_t length() const { return _end - _start; } - int set_start (nframes64_t s); - int set_end (nframes64_t e); - int set (nframes64_t start, nframes64_t end); + 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 move_to (nframes64_t pos); + int move_to (framepos_t pos); const std::string& name() const { return _name; } void set_name (const std::string &str) { _name = str; name_changed(this); } @@ -93,7 +83,6 @@ class Location : public PBD::StatefulDestructible 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_session_range (bool yn, void* src); void set_is_range_marker (bool yn, void* src); bool is_auto_punch () const { return _flags & IsAutoPunch; } @@ -105,14 +94,20 @@ class Location : public PBD::StatefulDestructible bool is_range_marker() const { return _flags & IsRangeMarker; } bool matches (Flags f) const { return _flags & f; } + Flags flags () const { return _flags; } + + boost::shared_ptr scene_change() const { return _scene_change; } + void set_scene_change (boost::shared_ptr); + PBD::Signal1 name_changed; PBD::Signal1 end_changed; PBD::Signal1 start_changed; + PBD::Signal1 LockChanged; PBD::Signal2 FlagsChanged; + PBD::Signal1 PositionLockStyleChanged; - /* this is sent only when both start&end change at the same time */ - + /* this is sent only when both start and end change at the same time */ PBD::Signal1 changed; /* CD Track / CD-Text info */ @@ -123,23 +118,34 @@ class Location : public PBD::StatefulDestructible XMLNode& get_state (void); int set_state (const XMLNode&, int version); + PositionLockStyle position_lock_style() const { return _position_lock_style; } + void set_position_lock_style (PositionLockStyle ps); + void recompute_frames_from_bbt (); + + static PBD::Signal0 scene_changed; + private: - std::string _name; - nframes64_t _start; - nframes64_t _end; - Flags _flags; - bool _locked; + std::string _name; + framepos_t _start; + Timecode::BBT_Time _bbt_start; + framepos_t _end; + Timecode::BBT_Time _bbt_end; + Flags _flags; + bool _locked; + PositionLockStyle _position_lock_style; + boost::shared_ptr _scene_change; void set_mark (bool yn); bool set_flag_internal (bool yn, Flags flag); + void recompute_bbt_from_frames (); }; -class Locations : public PBD::StatefulDestructible +class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDestructible { public: typedef std::list LocationList; - Locations (); + Locations (Session &); ~Locations (); const LocationList& list() { return locations; } @@ -152,7 +158,7 @@ class Locations : public PBD::StatefulDestructible XMLNode& get_state (void); int set_state (const XMLNode&, int version); - Location *get_location_by_id(PBD::ID); + Location *get_location_by_id(PBD::ID); Location* auto_loop_location () const; Location* auto_punch_location () const; @@ -164,26 +170,36 @@ class Locations : public PBD::StatefulDestructible int set_current (Location *, bool want_lock = true); Location *current () const { return current_location; } - Location *first_location_before (nframes64_t, bool include_special_ranges = false); - Location *first_location_after (nframes64_t, bool include_special_ranges = false); + 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_after (framepos_t, bool include_special_ranges = false); - void marks_either_side (nframes64_t const, nframes64_t &, nframes64_t &) const; + void marks_either_side (framepos_t const, framepos_t &, framepos_t &) const; - void find_all_between (nframes64_t start, nframes64_t, LocationList&, Location::Flags); + 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; - PBD::Signal0 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::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); (obj.*method)(locations); } template void apply (T1& obj, void (T1::*method)(LocationList&, T2& arg), T2& arg) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); (obj.*method)(locations, arg); } @@ -191,7 +207,7 @@ class Locations : public PBD::StatefulDestructible LocationList locations; Location *current_location; - mutable Glib::Mutex lock; + mutable Glib::Threads::Mutex lock; int set_current_unlocked (Location *); void location_changed (Location*);