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/auditioner.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/auditioner.cc')
| -rw-r--r-- | libs/ardour/auditioner.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index 262663970d..38fb2e5859 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -48,7 +48,7 @@ Auditioner::Auditioner (Session& s) } if (right.length()) { - disk_stream().add_channel(); + audio_diskstream().add_channel(); add_output_port (right, this, Buffer::AUDIO); } @@ -116,11 +116,11 @@ Auditioner::audition_region (AudioRegion& region) _diskstream->playlist()->add_region (*the_region, 0, 1, false); while (_diskstream->n_channels() < the_region->n_channels()) { - _diskstream->add_channel (); + audio_diskstream().add_channel (); } while (_diskstream->n_channels() > the_region->n_channels()) { - _diskstream->remove_channel (); + audio_diskstream().remove_channel (); } /* force a panner reset now that we have all channels */ |