smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

merge with master and fix 4 conflicts by hand

Browse source
This commit is contained in:
Paul Davis 2014-06-02 11:32:13 -04:00
commit 8c9749e42f
19 changed files with 137 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/sfdb_ui.cc
View file

@ -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);