summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-09-14 00:41:53 +0000
committerCarl Hetherington <carl@carlh.net>2010-09-14 00:41:53 +0000
commit875f0befd5fb52678d25544fcbcb6e6b55a2c483 (patch)
treeaffac8e73456192dfa9f360f9bd7e6a8651447d4 /libs/ardour/ardour
parent42acfc365f20762042d431f5d75c4a0d32b60b2b (diff)
Fix restoration of MementoCommand<Crossfade>. Fixes #3418.
git-svn-id: svn://localhost/ardour2/branches/3.0@7771 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/audioplaylist.h2
-rw-r--r--libs/ardour/ardour/playlist.h5
-rw-r--r--libs/ardour/ardour/session_playlists.h2
3 files changed, 9 insertions, 0 deletions
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 39a19d8ed1..edf5008283 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -91,6 +91,8 @@ public:
void update (const CrossfadeListProperty::ChangeRecord &);
+ boost::shared_ptr<Crossfade> find_crossfade (const PBD::ID &) const;
+
protected:
/* playlist "callbacks" */
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index feea056ac3..67638cf15e 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -50,6 +50,7 @@ namespace ARDOUR {
class Session;
class Region;
class Playlist;
+class Crossfade;
namespace Properties {
/* fake the type, since regions are handled by SequenceProperty which doesn't
@@ -210,6 +211,10 @@ public:
void set_explicit_relayering (bool e);
+ virtual boost::shared_ptr<Crossfade> find_crossfade (const PBD::ID &) const {
+ return boost::shared_ptr<Crossfade> ();
+ }
+
protected:
friend class Session;
diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h
index 1c83a312a5..4ca67bdee8 100644
--- a/libs/ardour/ardour/session_playlists.h
+++ b/libs/ardour/ardour/session_playlists.h
@@ -41,6 +41,7 @@ class Playlist;
class Region;
class Source;
class Session;
+class Crossfade;
class SessionPlaylists : public PBD::ScopedConnectionList
{
@@ -54,6 +55,7 @@ public:
void get (std::vector<boost::shared_ptr<Playlist> >&);
void unassigned (std::list<boost::shared_ptr<Playlist> > & list);
void destroy_region (boost::shared_ptr<Region>);
+ boost::shared_ptr<Crossfade> find_crossfade (const PBD::ID &);
private:
friend class Session;