X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fplaylist.h;h=352384b695c06aa5cbb4888bbff6e374162878cb;hb=cdfbec0eb1289c17159f3263c1e6256afdee67dc;hp=01bb12db8d810bcfdd75e02ed1e1b14492a02d5c;hpb=79f91c7a205d981d2b8cc15e32a6da02d8423065;p=ardour.git diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 01bb12db8d..352384b695 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -32,38 +32,72 @@ #include -#include #include "pbd/undo.h" #include "pbd/stateful.h" #include "pbd/statefuldestructible.h" +#include "pbd/sequence_property.h" #include "evoral/types.hpp" #include "ardour/ardour.h" #include "ardour/session_object.h" #include "ardour/crossfade_compare.h" -#include "ardour/location.h" #include "ardour/data_type.h" namespace ARDOUR { class Session; class Region; - -class Playlist : public SessionObject, - public boost::noncopyable, - public boost::enable_shared_from_this { +class Playlist; +class Crossfade; + +namespace Properties { + /* fake the type, since regions are handled by SequenceProperty which doesn't + care about such things. + */ + extern PBD::PropertyDescriptor regions; +} + +class RegionListProperty : public PBD::SequenceProperty > > +{ public: - typedef std::list > RegionList; + RegionListProperty (Playlist&); + + RegionListProperty* clone () const; + void get_content_as_xml (boost::shared_ptr, XMLNode &) const; + boost::shared_ptr get_content_from_xml (XMLNode const &) const; + + private: + RegionListProperty* create () const; + + /* copy construction only by ourselves */ + RegionListProperty (RegionListProperty const & p); + + friend class Playlist; + /* we live and die with our playlist, no lifetime management needed */ + Playlist& _playlist; +}; + +class Playlist : public SessionObject , public boost::enable_shared_from_this +{ +public: + typedef std::list > RegionList; + static void make_property_quarks (); Playlist (Session&, const XMLNode&, DataType type, bool hidden = false); Playlist (Session&, std::string name, DataType type, bool hidden = false); Playlist (boost::shared_ptr, std::string name, bool hidden = false); - Playlist (boost::shared_ptr, nframes_t start, nframes_t cnt, std::string name, bool hidden = false); + Playlist (boost::shared_ptr, framepos_t start, framecnt_t cnt, std::string name, bool hidden = false); virtual ~Playlist (); + void update (const RegionListProperty::ChangeRecord&); + void clear_owned_changes (); + void rdiff (std::vector&) const; + + boost::shared_ptr region_by_id (const PBD::ID&) const; + void set_region_ownership (); virtual void clear (bool with_signals=true); @@ -74,6 +108,7 @@ class Playlist : public SessionObject, bool used () const { return _refcnt != 0; } bool set_name (const std::string& str); + int sort_id() { return _sort_id; } const DataType& data_type() const { return _type; } @@ -83,7 +118,7 @@ class Playlist : public SessionObject, bool hidden() const { return _hidden; } bool empty() const; uint32_t n_regions() const; - nframes_t get_maximum_extent () const; + std::pair get_extent () const; layer_t top_layer() const; EditMode get_edit_mode() const { return _edit_mode; } @@ -91,54 +126,64 @@ class Playlist : public SessionObject, /* Editing operations */ - void add_region (boost::shared_ptr, nframes_t position, float times = 1, bool auto_partition = false); + void add_region (boost::shared_ptr, framepos_t position, float times = 1, bool auto_partition = false); void remove_region (boost::shared_ptr); + void remove_region_by_source (boost::shared_ptr); void get_equivalent_regions (boost::shared_ptr, std::vector >&); void get_region_list_equivalent_regions (boost::shared_ptr, std::vector >&); - void replace_region (boost::shared_ptr old, boost::shared_ptr newr, nframes_t pos); - void split_region (boost::shared_ptr, nframes_t position); - void split (nframes64_t at); - void shift (nframes64_t at, nframes64_t distance, bool move_intersected, bool ignore_music_glue); - void partition (nframes_t start, nframes_t end, bool cut = false); - void duplicate (boost::shared_ptr, nframes_t position, float times); - void nudge_after (nframes_t start, nframes_t distance, bool forwards); + void replace_region (boost::shared_ptr old, boost::shared_ptr newr, framepos_t pos); + void split_region (boost::shared_ptr, framepos_t position); + void split (framepos_t at); + void shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue); + void partition (framepos_t start, framepos_t end, bool cut = false); + void duplicate (boost::shared_ptr, framepos_t position, float times); + void nudge_after (framepos_t start, framecnt_t distance, bool forwards); void shuffle (boost::shared_ptr, int dir); void update_after_tempo_map_change (); boost::shared_ptr cut (std::list&, bool result_is_hidden = true); boost::shared_ptr copy (std::list&, bool result_is_hidden = true); - int paste (boost::shared_ptr, nframes_t position, float times); + int paste (boost::shared_ptr, framepos_t position, float times); + + const RegionListProperty& region_list () const { return regions; } - RegionList* regions_at (nframes_t frame); - RegionList* regions_touched (nframes_t start, nframes_t end); - RegionList* regions_to_read (nframes_t start, nframes_t end); + RegionList* regions_at (framepos_t frame); + uint32_t count_regions_at (framepos_t); + RegionList* regions_touched (framepos_t start, framepos_t end); + RegionList* regions_to_read (framepos_t start, framepos_t end); + uint32_t region_use_count (boost::shared_ptr) const; boost::shared_ptr find_region (const PBD::ID&) const; - boost::shared_ptr top_region_at (nframes_t frame); - boost::shared_ptr top_unmuted_region_at (nframes_t frame); - boost::shared_ptr find_next_region (nframes_t frame, RegionPoint point, int dir); - nframes64_t find_next_region_boundary (nframes64_t frame, int dir); + boost::shared_ptr top_region_at (framepos_t frame); + boost::shared_ptr top_unmuted_region_at (framepos_t frame); + boost::shared_ptr find_next_region (framepos_t frame, RegionPoint point, int dir); + framepos_t find_next_region_boundary (framepos_t frame, int dir); bool region_is_shuffle_constrained (boost::shared_ptr); + bool has_region_at (framepos_t const) const; - nframes64_t find_next_transient (nframes64_t position, int dir); - void foreach_region (sigc::slot >); + framepos_t find_next_transient (framepos_t position, int dir); + + void foreach_region (boost::function)>); XMLNode& get_state (); - int set_state (const XMLNode&, int version = 3000); + int set_state (const XMLNode&, int version); XMLNode& get_template (); - sigc::signal InUse; - sigc::signal Modified; - sigc::signal > RegionAdded; - sigc::signal > RegionRemoved; - sigc::signal NameChanged; - sigc::signal LengthChanged; - sigc::signal > const &> RangesMoved; + PBD::Signal1 InUse; + PBD::Signal0 ContentsChanged; + PBD::Signal1 > RegionAdded; + PBD::Signal1 > RegionRemoved; + PBD::Signal0 NameChanged; + PBD::Signal0 LengthChanged; + PBD::Signal0 LayeringChanged; + + /** Emitted when regions have moved (not when regions have only been trimmed) */ + PBD::Signal2 > const &, bool> RangesMoved; static std::string bump_name (std::string old_name, Session&); void freeze (); - void thaw (); + void thaw (bool from_undo = false); void raise_region (boost::shared_ptr); void lower_region (boost::shared_ptr); @@ -147,6 +192,7 @@ class Playlist : public SessionObject, uint32_t read_data_count() const { return _read_data_count; } + /* XXX: use of diskstream here is a little unfortunate */ const PBD::ID& get_orig_diskstream_id () const { return _orig_diskstream_id; } void set_orig_diskstream_id (const PBD::ID& did) { _orig_diskstream_id = did; } @@ -166,6 +212,12 @@ class Playlist : public SessionObject, void set_explicit_relayering (bool e); + virtual boost::shared_ptr find_crossfade (const PBD::ID &) const { + return boost::shared_ptr (); + } + + framepos_t find_next_top_layer_position (framepos_t) const; + protected: friend class Session; @@ -189,22 +241,30 @@ class Playlist : public SessionObject, friend class RegionLock; - RegionList regions; /* the current list of regions in the playlist */ + RegionListProperty regions; /* the current list of regions in the playlist */ std::set > all_regions; /* all regions ever added to this playlist */ - std::list region_state_changed_connections; + PBD::ScopedConnectionList region_state_changed_connections; DataType _type; + int _sort_id; mutable gint block_notifications; mutable gint ignore_state_changes; mutable Glib::RecMutex region_lock; std::set > pending_adds; std::set > pending_removes; RegionList pending_bounds; - bool pending_modified; + bool pending_contents_change; + bool pending_layering; bool pending_length; - std::list< Evoral::RangeMove > pending_range_moves; + + /** Movements of time ranges caused by region moves; note that + * region trims are not included in this list; it is used to + * do automation-follows-regions. + */ + std::list< Evoral::RangeMove > pending_range_moves; bool save_on_thaw; std::string last_save_reason; uint32_t in_set_state; + bool in_update; bool first_set_state; bool _hidden; bool _splicing; @@ -219,7 +279,7 @@ class Playlist : public SessionObject, uint32_t _read_data_count; PBD::ID _orig_diskstream_id; uint64_t layer_op_counter; - nframes_t freeze_length; + framecnt_t freeze_length; bool auto_partition; /** true if relayering should be done using region's current layers and their `pending explicit relayer' @@ -236,33 +296,36 @@ class Playlist : public SessionObject, } void delay_notifications (); - void release_notifications (); - virtual void flush_notifications (); + void release_notifications (bool from_undo = false); + virtual void flush_notifications (bool from_undo = false); + void clear_pending (); + + void _set_sort_id (); void notify_region_removed (boost::shared_ptr); void notify_region_added (boost::shared_ptr); void notify_length_changed (); void notify_layering_changed (); - void notify_modified (); - void notify_state_changed (Change); + void notify_contents_changed (); + void notify_state_changed (const PBD::PropertyChange&); void notify_region_moved (boost::shared_ptr); void mark_session_dirty(); - void region_changed_proxy (Change, boost::weak_ptr); - virtual bool region_changed (Change, boost::shared_ptr); + void region_changed_proxy (const PBD::PropertyChange&, boost::weak_ptr); + virtual bool region_changed (const PBD::PropertyChange&, boost::shared_ptr); - void region_bounds_changed (Change, boost::shared_ptr); + void region_bounds_changed (const PBD::PropertyChange&, boost::shared_ptr); void region_deleted (boost::shared_ptr); void sort_regions (); - void possibly_splice (nframes_t at, nframes64_t distance, boost::shared_ptr exclude = boost::shared_ptr()); - void possibly_splice_unlocked(nframes_t at, nframes64_t distance, boost::shared_ptr exclude = boost::shared_ptr()); + void possibly_splice (framepos_t at, framecnt_t distance, boost::shared_ptr exclude = boost::shared_ptr()); + void possibly_splice_unlocked(framepos_t at, framecnt_t distance, boost::shared_ptr exclude = boost::shared_ptr()); - void core_splice (nframes_t at, nframes64_t distance, boost::shared_ptr exclude); - void splice_locked (nframes_t at, nframes64_t distance, boost::shared_ptr exclude); - void splice_unlocked (nframes_t at, nframes64_t distance, boost::shared_ptr exclude); + void core_splice (framepos_t at, framecnt_t distance, boost::shared_ptr exclude); + void splice_locked (framepos_t at, framecnt_t distance, boost::shared_ptr exclude); + void splice_unlocked (framepos_t at, framecnt_t distance, boost::shared_ptr exclude); virtual void finalize_split_region (boost::shared_ptr /*original*/, boost::shared_ptr /*left*/, boost::shared_ptr /*right*/) {} @@ -272,31 +335,31 @@ class Playlist : public SessionObject, virtual XMLNode& state (bool); - boost::shared_ptr region_by_id (PBD::ID); - - bool add_region_internal (boost::shared_ptr, nframes_t position); + bool add_region_internal (boost::shared_ptr, framepos_t position); int remove_region_internal (boost::shared_ptr); - RegionList *find_regions_at (nframes_t frame); + RegionList *find_regions_at (framepos_t); void copy_regions (RegionList&) const; - void partition_internal (nframes_t start, nframes_t end, bool cutting, RegionList& thawlist); + void partition_internal (framepos_t start, framepos_t end, bool cutting, RegionList& thawlist); - nframes_t _get_maximum_extent() const; + std::pair _get_extent() const; - boost::shared_ptr cut_copy (boost::shared_ptr (Playlist::*pmf)(nframes_t, nframes_t, bool), - std::list& ranges, bool result_is_hidden); - boost::shared_ptr cut (nframes_t start, nframes_t cnt, bool result_is_hidden); - boost::shared_ptr copy (nframes_t start, nframes_t cnt, bool result_is_hidden); + boost::shared_ptr cut_copy (boost::shared_ptr (Playlist::*pmf)(framepos_t, framecnt_t, bool), + std::list& ranges, bool result_is_hidden); + boost::shared_ptr cut (framepos_t start, framecnt_t cnt, bool result_is_hidden); + boost::shared_ptr copy (framepos_t start, framecnt_t cnt, bool result_is_hidden); int move_region_to_layer (layer_t, boost::shared_ptr r, int dir); void relayer (); + void begin_undo (); + void end_undo (); void unset_freeze_parent (Playlist*); void unset_freeze_child (Playlist*); void timestamp_layer_op (boost::shared_ptr); - void _split_region (boost::shared_ptr, nframes_t position); + void _split_region (boost::shared_ptr, framepos_t position); }; } /* namespace ARDOUR */