diff options
| author | David Robillard <d@drobilla.net> | 2006-07-19 05:44:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-19 05:44:23 +0000 |
| commit | 0cdb918d4dd409075c0e2fdc50633e7b6adb22f2 (patch) | |
| tree | 0c2901a6c81dffa69a87533b70c6f8e5bffa2ed4 /libs/ardour/diskstream.cc | |
| parent | 50a3102b9b533d7f8786d220f8df67421b9227c8 (diff) | |
Work towards removal of Session's Diskstream list.
Havn't managed to completely remove it because of Session loading from XML - the
Diskstreams are separate from the Tracks (I assume as a throwback to when they
were distinct) so the Diskstreams need to be stored somewhere until the Tracks
are loaded. Ideally tracks should completely own their Diskstreams - not sure
how to accomplish this without breaking Session loading though...
git-svn-id: svn://localhost/ardour2/branches/midi@687 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index 8b7edae6b4..4e2bec9850 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -63,16 +63,14 @@ sigc::signal<void> Diskstream::DiskOverrun; sigc::signal<void> Diskstream::DiskUnderrun; Diskstream::Diskstream (Session &sess, const string &name, Flag flag) - : deprecated_io_node(NULL) - , _name (name) + : _name (name) , _session (sess) { init (flag); } Diskstream::Diskstream (Session& sess, const XMLNode& node) - : deprecated_io_node(NULL) - , _session (sess) + : _session (sess) { init (Recordable); @@ -114,7 +112,6 @@ Diskstream::init (Flag f) playback_distance = 0; _read_data_count = 0; _write_data_count = 0; - deprecated_io_node = 0; /* there are no channels at this point, so these two calls just get speed_buffer_size and wrap_buffer @@ -188,7 +185,7 @@ Diskstream::realtime_set_speed (double sp, bool global) if (!global) { _seek_required = true; } - speed_changed (); /* EMIT SIGNAL */ + SpeedChanged (); /* EMIT SIGNAL */ } return _buffer_reallocation_required || _seek_required; |