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/editor_export_audio.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/editor_export_audio.cc')
| -rw-r--r-- | gtk2_ardour/editor_export_audio.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 70c4863fd3..ec4727ad04 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -41,6 +41,7 @@ #include <ardour/audio_diskstream.h> #include <ardour/audioregion.h> #include <ardour/audioplaylist.h> +#include <ardour/chan_count.h> #include "i18n.h" @@ -302,7 +303,7 @@ Editor::write_audio_selection (TimeSelection& ts) } bool -Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<AudioRange>& range) +Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list<AudioRange>& range) { AudioFileSource* fs; const jack_nframes_t chunk_size = 4096; @@ -315,6 +316,8 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi string path; vector<AudioFileSource *> sources; + uint32_t channels = count.get(DataType::AUDIO); + for (uint32_t n=0; n < channels; ++n) { for (cnt = 0; cnt < 999999; ++cnt) { |