diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
commit | 8c9749e42faf7808034ed8b7afce4a2fe6dc6f33 (patch) | |
tree | 823af8a96f4e0b2a404f5e52eadf4f46e1d10229 /gtk2_ardour/sfdb_ui.cc | |
parent | f6d29abfc75c460b9e35717f2907e4e61bf38058 (diff) | |
parent | 08a1409b1f5b5558d2eccc28a3ae4cbd44391812 (diff) |
merge with master and fix 4 conflicts by hand
Diffstat (limited to 'gtk2_ardour/sfdb_ui.cc')
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 8011268335..72cd75abb1 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -281,7 +281,7 @@ SoundFileBox::setup_labels (const string& filename) string error_msg; - if (SMFSource::safe_midi_file_extension (path)) { + if (SMFSource::valid_midi_file (path)) { boost::shared_ptr<SMFSource> ms = boost::dynamic_pointer_cast<SMFSource> ( @@ -406,7 +406,7 @@ SoundFileBox::audition () boost::shared_ptr<Region> r; - if (SMFSource::safe_midi_file_extension (path)) { + if (SMFSource::valid_midi_file (path)) { boost::shared_ptr<SMFSource> ms = boost::dynamic_pointer_cast<SMFSource> ( @@ -1326,7 +1326,7 @@ SoundFileOmega::reset_options () /* See if we are thinking about importing any MIDI files */ vector<string>::iterator i = paths.begin (); - while (i != paths.end() && SMFSource::safe_midi_file_extension (*i) == false) { + while (i != paths.end() && SMFSource::valid_midi_file (*i) == false) { ++i; } bool const have_a_midi_file = (i != paths.end ()); @@ -1554,7 +1554,7 @@ SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool& src_needed = true; } - } else if (SMFSource::safe_midi_file_extension (*i)) { + } else if (SMFSource::valid_midi_file (*i)) { Evoral::SMF reader; reader.open(*i); |