diff options
author | David Robillard <d@drobilla.net> | 2007-01-11 19:50:49 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-01-11 19:50:49 +0000 |
commit | f7563c2b158252339f98e38719cfc3e092ef7ac7 (patch) | |
tree | b90084b8cc82e613a9dfc73202fdffcf0a05481d /libs/ardour/ardour/audioplaylist.h | |
parent | 532f6aad4ac79ca15d69deccd18fca90e444c437 (diff) |
Merged with trunk R1304
git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioplaylist.h')
-rw-r--r-- | libs/ardour/ardour/audioplaylist.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index c0d5ed6e75..36fe027a6f 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -37,7 +37,7 @@ class Source; class AudioPlaylist : public ARDOUR::Playlist { public: - typedef std::list<Crossfade*> Crossfades; + typedef std::list<boost::shared_ptr<Crossfade> > Crossfades; public: AudioPlaylist (Session&, const XMLNode&, bool hidden = false); @@ -53,9 +53,9 @@ class AudioPlaylist : public ARDOUR::Playlist int set_state (const XMLNode&); - sigc::signal<void,Crossfade *> NewCrossfade; + sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade; - template<class T> void foreach_crossfade (T *t, void (T::*func)(Crossfade *)); + template<class T> void foreach_crossfade (T *t, void (T::*func)(boost::shared_ptr<Crossfade>)); void crossfades_at (nframes_t frame, Crossfades&); bool destroy_region (boost::shared_ptr<Region>); @@ -63,7 +63,7 @@ class AudioPlaylist : public ARDOUR::Playlist protected: /* playlist "callbacks" */ - void notify_crossfade_added (Crossfade *); + void notify_crossfade_added (boost::shared_ptr<Crossfade>); void flush_notifications (); void finalize_split_region (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right); @@ -73,16 +73,16 @@ class AudioPlaylist : public ARDOUR::Playlist void remove_dependents (boost::shared_ptr<Region> region); private: - Crossfades _crossfades; /* xfades currently in use */ + Crossfades _crossfades; Crossfades _pending_xfade_adds; - void crossfade_invalidated (Crossfade*); + void crossfade_invalidated (boost::shared_ptr<Crossfade>); XMLNode& state (bool full_state); void dump () const; bool region_changed (Change, boost::shared_ptr<Region>); void crossfade_changed (Change); - void add_crossfade (Crossfade&); + void add_crossfade (boost::shared_ptr<Crossfade>); void source_offset_changed (boost::shared_ptr<AudioRegion> region); }; |