diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/audioregion.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_region.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/region.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/region_factory.h | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 0776669874..8d929827c5 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -183,7 +183,8 @@ class AudioRegion : public Region AudioRegion (boost::shared_ptr<AudioSource>); AudioRegion (const SourceList &); - AudioRegion (boost::shared_ptr<const AudioRegion>, frameoffset_t offset = 0, bool offset_relative = true); + AudioRegion (boost::shared_ptr<const AudioRegion>); + AudioRegion (boost::shared_ptr<const AudioRegion>, frameoffset_t offset); AudioRegion (boost::shared_ptr<const AudioRegion>, const SourceList&); AudioRegion (SourceList &); diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index edd9ef31e4..016536b8b4 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -121,7 +121,8 @@ class MidiRegion : public Region PBD::Property<Evoral::MusicalTime> _length_beats; MidiRegion (const SourceList&); - MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset = 0, bool offset_relative = true); + MidiRegion (boost::shared_ptr<const MidiRegion>); + MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset); framecnt_t _read_at (const SourceList&, Evoral::EventSink<framepos_t>& dst, framepos_t position, diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 63ac879eeb..3bb5d0aac8 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -307,8 +307,12 @@ class Region /** Construct a region from multiple sources*/ Region (const SourceList& srcs); + /** Construct a region from another region */ + Region (boost::shared_ptr<const Region>); + /** Construct a region from another region, at an offset within that region */ - Region (boost::shared_ptr<const Region>, frameoffset_t start_offset = 0, bool start_relative = true); + Region (boost::shared_ptr<const Region>, frameoffset_t start_offset); + /** Construct a region as a copy of another region, but with different sources */ Region (boost::shared_ptr<const Region>, const SourceList&); diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index af6c2759cf..b47ba71cc9 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -92,10 +92,6 @@ public: private: - static boost::shared_ptr<Region> create (boost::shared_ptr<Region>, frameoffset_t offset, - bool offset_relative, - const PBD::PropertyList&, bool announce = true); - static void region_changed (PBD::PropertyChange const &, boost::weak_ptr<Region>); static Glib::StaticMutex region_map_lock; |