diff options
author | Damien Zammit <damien@zamaudio.com> | 2014-04-29 06:44:40 +1000 |
---|---|---|
committer | Damien Zammit <damien@zamaudio.com> | 2014-04-29 06:48:29 +1000 |
commit | 2f6065b32c26dba0f7ea5da5c980d0406c36cc55 (patch) | |
tree | 32e72f96535480bbb6ae346e69866c03a61a6b3a /gtk2_ardour/sfdb_ui.cc | |
parent | f5276a104c2d544cf537db9e9b8de9022de7ad56 (diff) |
Fixed problem where importing invalid midi files caused crash.3.5.380
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 4b89cd51fe..6e08617af2 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -279,7 +279,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> ( @@ -404,7 +404,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> ( @@ -1307,7 +1307,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 ()); @@ -1535,7 +1535,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); |