diff options
| author | David Robillard <d@drobilla.net> | 2008-02-19 03:24:44 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-19 03:24:44 +0000 |
| commit | 012292b4bdf5bf843232243852b39e8892b837de (patch) | |
| tree | cddefe42aab1301df0677d652d37ba757894d97b /libs/ardour/import.cc | |
| parent | b79d5bfad3473f54ab24c0b7852fc4bfc9d9ebb0 (diff) | |
Less crash-happy MIDI reading on weird MIDI files.
Make "show existing automation" create/show automation tracks for all contained CC in MIDI tracks.
Fix staggered time when importing multi-track MIDI files.
git-svn-id: svn://localhost/ardour2/branches/3.0@3086 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/import.cc')
| -rw-r--r-- | libs/ardour/import.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index b028e1c1a7..60fb5eddb8 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -270,10 +270,6 @@ write_midi_data_to_new_files (SMFReader* source, Session::import_status& status, { MidiEvent ev(0.0, 4, NULL, true); - uint64_t t = 0; - uint32_t delta_t = 0; - uint32_t size = 0; - status.progress = 0.0f; try { @@ -283,6 +279,10 @@ write_midi_data_to_new_files (SMFReader* source, Session::import_status& status, boost::shared_ptr<SMFSource> smfs = boost::dynamic_pointer_cast<SMFSource>(newfiles[i-1]); source->seek_to_track(i); + + uint64_t t = 0; + uint32_t delta_t = 0; + uint32_t size = 0; while (!status.cancel) { |