diff options
author | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
commit | 50a3102b9b533d7f8786d220f8df67421b9227c8 (patch) | |
tree | 669f84631ba1d9a1d312e3f76b226ca938c75c0f /libs/ardour/diskstream.cc | |
parent | edd841895b873b14c4aa814a80de5dc20ff30618 (diff) |
Merge big changes (mostly Controllable) from trunk
git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
-rw-r--r-- | libs/ardour/diskstream.cc | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index 050f23497b..8b7edae6b4 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -63,48 +63,24 @@ sigc::signal<void> Diskstream::DiskOverrun; sigc::signal<void> Diskstream::DiskUnderrun; Diskstream::Diskstream (Session &sess, const string &name, Flag flag) - : _name (name) + : deprecated_io_node(NULL) + , _name (name) , _session (sess) { -#if 0 - /* prevent any write sources from being created */ - - in_set_state = true; - init (flag); - //use_new_playlist (); - - in_set_state = false; - DiskstreamCreated (this); /* EMIT SIGNAL */ -#endif } Diskstream::Diskstream (Session& sess, const XMLNode& node) - : _session (sess) + : deprecated_io_node(NULL) + , _session (sess) { -#if 0 - in_set_state = true; init (Recordable); - - /*if (set_state (node)) { - in_set_state = false; - throw failed_constructor(); - }*/ - - in_set_state = false; - - //if (destructive()) { - // use_destructive_playlist (); - //} - DiskstreamCreated (this); /* EMIT SIGNAL */ -#endif } void Diskstream::init (Flag f) { - _id = new_id(); _refcnt = 0; _flags = f; _io = 0; |