X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fplaylist.h;h=a7ead83eef8a6bc60b7c7ff3a582d735afcb46cc;hb=b1775149307a157444c516693ad6b98a404ef1b2;hp=7635d004bcbd6883322131d4fa967e11f5021424;hpb=16c280e40582209e151f54ea7b9d0e9b67048b68;p=ardour.git diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 7635d004bc..a7ead83eef 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -49,19 +49,19 @@ namespace ARDOUR { class Session; class Region; class Playlist; -class Crossfade; +class Crossfade; namespace Properties { - /* fake the type, since regions are handled by SequenceProperty which doesn't - care about such things. - */ - extern PBD::PropertyDescriptor regions; + /* 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: - RegionListProperty (Playlist&); + RegionListProperty (Playlist&); RegionListProperty* clone () const; void get_content_as_xml (boost::shared_ptr, XMLNode &) const; @@ -73,16 +73,16 @@ class RegionListProperty : public PBD::SequenceProperty { public: typedef std::list > RegionList; - static void make_property_quarks (); + static void make_property_quarks (); Playlist (Session&, const XMLNode&, DataType type, bool hidden = false); Playlist (Session&, std::string name, DataType type, bool hidden = false); @@ -91,9 +91,9 @@ public: virtual ~Playlist (); - void update (const RegionListProperty::ChangeRecord&); - void clear_owned_changes (); - void rdiff (std::vector&) const; + void update (const RegionListProperty::ChangeRecord&); + void clear_owned_changes (); + void rdiff (std::vector&) const; boost::shared_ptr region_by_id (const PBD::ID&) const; @@ -109,7 +109,7 @@ public: bool used () const { return _refcnt != 0; } bool set_name (const std::string& str); - int sort_id() { return _sort_id; } + int sort_id() { return _sort_id; } const DataType& data_type() const { return _type; } @@ -152,7 +152,7 @@ public: const RegionListProperty& region_list () const { return regions; } RegionList* regions_at (framepos_t frame); - uint32_t count_regions_at (framepos_t) const; + uint32_t count_regions_at (framepos_t) const; uint32_t count_joined_regions () const; RegionList* regions_touched (framepos_t start, framepos_t end); RegionList* regions_to_read (framepos_t start, framepos_t end); @@ -165,7 +165,7 @@ public: bool region_is_shuffle_constrained (boost::shared_ptr); bool has_region_at (framepos_t const) const; - bool uses_source (boost::shared_ptr src) const; + bool uses_source (boost::shared_ptr src) const; framepos_t find_next_transient (framepos_t position, int dir); @@ -180,7 +180,6 @@ public: 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) */ @@ -201,17 +200,14 @@ public: void raise_region_to_top (boost::shared_ptr); void lower_region_to_bottom (boost::shared_ptr); - 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; } + const PBD::ID& get_orig_track_id () const { return _orig_track_id; } + void set_orig_track_id (const PBD::ID& did); /* destructive editing */ virtual bool destroy_region (boost::shared_ptr) = 0; - void sync_all_regions_with_regions (); + void sync_all_regions_with_regions (); /* special case function used by UI selection objects, which have playlists that actually own the regions within them. @@ -219,19 +215,15 @@ public: void drop_regions (); - bool explicit_relayering () const { - return _explicit_relayering; - } - - 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; + framepos_t find_next_top_layer_position (framepos_t) const; uint32_t combine_ops() const { return _combine_ops; } + uint64_t highest_layering_index () const; + protected: friend class Session; @@ -255,11 +247,11 @@ public: friend class RegionLock; - RegionListProperty 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 */ PBD::ScopedConnectionList region_state_changed_connections; DataType _type; - int _sort_id; + int _sort_id; mutable gint block_notifications; mutable gint ignore_state_changes; mutable Glib::RecMutex region_lock; @@ -268,7 +260,6 @@ public: RegionList pending_bounds; bool pending_contents_change; bool pending_layering; - bool pending_length; /** Movements of time ranges caused by region moves; note that * region trims are not included in this list; it is used to @@ -292,19 +283,10 @@ public: bool in_partition; bool _frozen; uint32_t subcnt; - uint32_t _read_data_count; - PBD::ID _orig_diskstream_id; - uint64_t layer_op_counter; - framecnt_t freeze_length; + PBD::ID _orig_track_id; bool auto_partition; uint32_t _combine_ops; - /** true if relayering should be done using region's current layers and their `pending explicit relayer' - * flags; otherwise false if relayering should be done using the layer-model (most recently moved etc.) - * Explicit relayering is used by tracks in stacked regionview mode. - */ - bool _explicit_relayering; - void init (bool hide); bool holding_state () const { @@ -317,11 +299,10 @@ public: virtual void flush_notifications (bool from_undo = false); void clear_pending (); - void _set_sort_id (); + 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_contents_changed (); void notify_state_changed (const PBD::PropertyChange&); @@ -368,7 +349,6 @@ public: 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 (); @@ -376,12 +356,10 @@ public: void unset_freeze_parent (Playlist*); void unset_freeze_child (Playlist*); - void timestamp_layer_op (boost::shared_ptr); - void _split_region (boost::shared_ptr, framepos_t position); typedef std::pair, boost::shared_ptr > TwoRegions; - virtual void copy_dependents (const std::vector&, boost::shared_ptr) { } + virtual void copy_dependents (const std::vector&, Playlist*) const { } struct RegionInfo { boost::shared_ptr region;