diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-27 16:29:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-27 16:29:01 +0000 |
| commit | 33c61757fc8352fdb1280bca28b54d1adee183ff (patch) | |
| tree | 3079597365e70769acd6befe3fa95dc8e9f87439 /libs/ardour/ardour | |
| parent | fc3be1d42c6400896a85edbc83bda38242cec30a (diff) | |
promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple regions, even regions of mixed type. this mostly involved some trivial code changes but to make the code simpler and less error prone, the API switched away from using RegionSelection (list of regionviews that catches regionviews vanishing) and used RegionList (lists of regions, no semantics) instead.
git-svn-id: svn://localhost/ardour2/branches/3.0@11362 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/midi_stretch.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/midi_stretch.h b/libs/ardour/ardour/midi_stretch.h index 90c75bbc18..9b4fba80ce 100644 --- a/libs/ardour/ardour/midi_stretch.h +++ b/libs/ardour/ardour/midi_stretch.h @@ -26,13 +26,13 @@ namespace ARDOUR { class MidiStretch : public Filter { public: - MidiStretch (ARDOUR::Session&, TimeFXRequest&); + MidiStretch (ARDOUR::Session&, const TimeFXRequest&); ~MidiStretch (); int run (boost::shared_ptr<ARDOUR::Region>, Progress* progress = 0); private: - TimeFXRequest& _request; + const TimeFXRequest& _request; }; } /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 022fdb3ccb..1f66310877 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -81,7 +81,6 @@ class RegionListProperty : public PBD::SequenceProperty<std::list<boost::shared_ class Playlist : public SessionObject , public boost::enable_shared_from_this<Playlist> { public: - typedef std::list<boost::shared_ptr<Region> > RegionList; static void make_property_quarks (); Playlist (Session&, const XMLNode&, DataType type, bool hidden = false); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index c2c7289329..c34869bc2b 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -82,6 +82,8 @@ namespace ARDOUR { // associate a set of intervals with regions (e.g. for silence detection) typedef std::map<boost::shared_ptr<ARDOUR::Region>,AudioIntervalResult> AudioIntervalMap; + typedef std::list<boost::shared_ptr<Region> > RegionList; + struct IOChange { enum Type { |