diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-04-21 21:29:15 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-04-21 21:29:15 +0000 |
| commit | 950ac6ef2b08b460adb16a1a3690077ecf55314c (patch) | |
| tree | 480fbd68d985cb610b3f577268f333a3947c3f25 /libs/ardour/session.cc | |
| parent | 061a85191c301ac18f2e8ca59d43127a4499ba96 (diff) | |
Don't try to load separate diskstreams in 3.0 session files. Fix a few uses of Diskstream outside Track.
git-svn-id: svn://localhost/ardour2/branches/3.0@6946 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session.cc')
| -rw-r--r-- | libs/ardour/session.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 5c9ee380c9..9cf48b7154 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1461,7 +1461,7 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m auto_connect_route (track, existing_inputs, existing_outputs); - track->midi_diskstream()->non_realtime_input_change(); + track->non_realtime_input_change(); if (route_group) { route_group->add (track); } @@ -1630,7 +1630,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod route_group->add (track); } - track->audio_diskstream()->non_realtime_input_change(); + track->non_realtime_input_change(); track->DiskstreamChanged.connect_same_thread (*this, boost::bind (&Session::resort_routes, this)); track->set_remote_control_id (control_id); @@ -3327,7 +3327,7 @@ Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end, boost::shared_ptr<AudioFileSource> fsource; uint32_t x; char buf[PATH_MAX+1]; - ChanCount nchans(track.audio_diskstream()->n_channels()); + ChanCount nchans(track.n_channels()); nframes_t position; nframes_t this_chunk; nframes_t to_do; |