allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Add option to separate type-0 SMF channels to tracks

Browse Source
This commit is contained in:
Robin Gareus
2016-10-05 20:53:22 +02:00
parent 1aafc16955
commit aa4343a18c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/import_status.h
View File

@@ -42,6 +42,7 @@ public:
volatile bool freeze;
std::vector<std::string> paths;
bool replace_existing_source;
bool split_midi_channels;
/** set to true when all files have been imported, as distinct from the done in ARDOUR::InterThreadInfo,
* which indicates that one run of the import thread has been completed.

9
libs/ardour/import.cc
View File

@@ -338,14 +338,15 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
static void
write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
vector<boost::shared_ptr<Source> >& newfiles)
vector<boost::shared_ptr<Source> >& newfiles,
bool split_type0)
{
uint32_t buf_size = 4;
uint8_t* buf = (uint8_t*) malloc (buf_size);
status.progress = 0.0f;
uint16_t num_tracks;
bool type0 = source->is_type0 ();
bool type0 = source->is_type0 () && split_type0;
const std::set<uint8_t>& chn = source->channels ();
if (type0) {
@@ -509,7 +510,7 @@ Session::import_files (ImportStatus& status)
smf_reader = std::auto_ptr<Evoral::SMF>(new Evoral::SMF());
smf_reader->open(*p);
if (smf_reader->is_type0 ()) {
if (smf_reader->is_type0 () && status.split_midi_channels) {
channels = smf_reader->channels().size();
} else {
channels = smf_reader->num_tracks();
@@ -557,7 +558,7 @@ Session::import_files (ImportStatus& status)
write_audio_data_to_new_files (source.get(), status, newfiles);
} else if (smf_reader.get()) { // midi
status.doing_what = string_compose(_("Loading MIDI file %1"), *p);
write_midi_data_to_new_files (smf_reader.get(), status, newfiles);
write_midi_data_to_new_files (smf_reader.get(), status, newfiles, status.split_midi_channels);
}
++status.current;