diff options
| author | David Robillard <d@drobilla.net> | 2006-08-12 08:20:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-12 08:20:24 +0000 |
| commit | 30ab1fd61569f9d7fb7410d483fa68cbf9865c37 (patch) | |
| tree | 60cf9b5228a2728cda6608d517528066253d1a17 /gtk2_ardour/audio_streamview.cc | |
| parent | cbdf686e391bc2e7b93f37a5d3fa9197cb178078 (diff) | |
Towards MIDI:
- Converted vector<Sample*> to BufferList and numerous counts from int to ChanCount (and related changes)
- Added fancy type-generic iterators to BufferList, PortIterator (see IO::collect_input for a good example of the idea - the same code will work to read all input (of various types in a single IO, eg instruments) without modification no matter how many types we add)
- Fixed comparison operator bugs with ChanCount (screwed up metering among other things)
- Moved peak metering into it's own object, and moved most of the pan related code out of IO to panner (still a touch more to be done here for MIDI playback)
Not directly MIDI related fixes for problems in trunk:
- Fixed varispeed gain/pan automation to work properly (was reading the wrong range of automation data, probably causing nasty clicks?)
- Fixed crash on varispeed looping (possibly only a 64-bit problem). It still doesn't work, but at least it doesn't die
Quite a few things broken, and the new classes are pretty filthy still, but I think the direction is a lot better than all my previous plans...
git-svn-id: svn://localhost/ardour2/branches/midi@795 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.cc')
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 82349947c6..2e82d48ff3 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -402,7 +402,7 @@ AudioStreamView::setup_rec_box () AudioDiskstream* ads = dynamic_cast<AudioDiskstream*>(_trackview.get_diskstream()); assert(ads); - for (uint32_t n=0; n < ads->n_channels(); ++n) { + for (uint32_t n=0; n < ads->n_channels().get(DataType::AUDIO); ++n) { AudioSource *src = (AudioSource *) ads->write_source (n); if (src) { sources.push_back (src); @@ -553,7 +553,7 @@ AudioStreamView::rec_peak_range_ready (jack_nframes_t start, jack_nframes_t cnt, rec_peak_ready_map[src] = true; - if (rec_peak_ready_map.size() == _trackview.get_diskstream()->n_channels()) { + if (rec_peak_ready_map.size() == _trackview.get_diskstream()->n_channels().get(DataType::AUDIO)) { this->update_rec_regions (); rec_peak_ready_map.clear(); } |