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/audio_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/audio_diskstream.cc')
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 20dbb915b0..a3345cf15a 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -59,6 +59,7 @@ sigc::signal<void,list<AudioFileSource*>*> AudioDiskstream::DeleteSources; AudioDiskstream::AudioDiskstream (Session &sess, const string &name, Diskstream::Flag flag) : Diskstream(sess, name, flag) + , deprecated_io_node(NULL) , _playlist(NULL) { /* prevent any write sources from being created */ @@ -75,6 +76,7 @@ AudioDiskstream::AudioDiskstream (Session &sess, const string &name, Diskstream: AudioDiskstream::AudioDiskstream (Session& sess, const XMLNode& node) : Diskstream(sess, node) + , deprecated_io_node(NULL) , _playlist(NULL) { in_set_state = true; @@ -1832,7 +1834,7 @@ AudioDiskstream::engage_record_enable (void* src) } } - record_enable_changed (src); /* EMIT SIGNAL */ + RecordEnableChanged (src); /* EMIT SIGNAL */ } void @@ -1847,7 +1849,7 @@ AudioDiskstream::disengage_record_enable (void* src) } } capturing_sources.clear (); - record_enable_changed (src); /* EMIT SIGNAL */ + RecordEnableChanged (src); /* EMIT SIGNAL */ } |