diff options
author | David Robillard <d@drobilla.net> | 2009-10-26 17:24:08 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-10-26 17:24:08 +0000 |
commit | 8d168bda874ae05b142e122cb48407ee4e1b442d (patch) | |
tree | 0f1c6d0fb7f463b66dfc521fad2e57e661f0d6f5 /libs/ardour/ardour/source.h | |
parent | fa5aeb7892fb73d45782b42da731bc5a51418e79 (diff) |
Remove cyclic Source->Playlist references (and with it all dependence on Playlist from Source and children and a bunch of finicky reference managing code).
git-svn-id: svn://localhost/ardour2/branches/3.0@5925 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/source.h')
-rw-r--r-- | libs/ardour/ardour/source.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index 1ffca509fd..62aca91365 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -35,7 +35,6 @@ namespace ARDOUR { class Session; -class Playlist; class Source : public SessionObject, public boost::noncopyable { @@ -77,7 +76,7 @@ class Source : public SessionObject, public boost::noncopyable XMLNode& get_state (); int set_state (const XMLNode&, int version); - + bool destructive() const { return (_flags & Destructive); } bool writable () const { return (_flags & Writable); } virtual bool set_destructive (bool /*yn*/) { return false; } @@ -86,11 +85,6 @@ class Source : public SessionObject, public boost::noncopyable void use () { _in_use++; } void disuse () { if (_in_use) { _in_use--; } } - void add_playlist (boost::shared_ptr<ARDOUR::Playlist>); - void remove_playlist (boost::weak_ptr<ARDOUR::Playlist>); - - uint32_t used() const; - static sigc::signal<void,Source*> SourceCreated; sigc::signal<void,boost::shared_ptr<Source> > Switched; @@ -123,9 +117,6 @@ class Source : public SessionObject, public boost::noncopyable mutable Glib::Mutex _analysis_lock; Glib::Mutex _playlist_lock; - typedef std::map<boost::shared_ptr<ARDOUR::Playlist>, uint32_t > PlaylistMap; - PlaylistMap _playlists; - private: uint32_t _in_use; void fix_writable_flags (); |