Merge branch 'patch-1' of https://github.com/globin/ardour

[ardour.git] / libs / ardour / import.cc

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 433160fc2030dfd166bcd5a7cc6794b07d470071..047b46f55305d5ff68d3beda87e0623ce60abe7d 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -214,8 +214,7 @@ map_existing_mono_sources (const vector<string>& new_paths, Session& /*sess*/,
 }
 
 static bool
-create_mono_sources_for_writing (const string& origin,
-                                 const vector<string>& new_paths,
+create_mono_sources_for_writing (const vector<string>& new_paths,
                                  Session& sess, uint samplerate,
                                  vector<boost::shared_ptr<Source> >& newfiles,
                                  framepos_t timeline_position)
@@ -229,7 +228,6 @@ create_mono_sources_for_writing (const string& origin,
 
                        source = SourceFactory::createWritable (type, sess,
                                                                i->c_str(),
-                                                               origin,
                                                                false, // destructive
                                                                samplerate);
                }
@@ -420,10 +418,11 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
                                        first = false;
                                }
 
-                               smfs->append_event_unlocked_beats(Evoral::Event<double>(0,
-                                                                                       (double)t / (double)source->ppqn(),
-                                                                                       size,
-                                                                                       buf));
+                               smfs->append_event_unlocked_beats(
+                                       Evoral::Event<double>(0,
+                                                             (double)t / (double)source->ppqn(),
+                                                             size,
+                                                             buf));
 
                                if (status.progress < 0.99) {
                                        status.progress += 0.01;
@@ -451,7 +450,7 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
                }
 
        } catch (...) {
-               error << string_compose (_("MIDI file %1 was not readable (no reason available"), source->file_path()) << endmsg;
+               error << string_compose (_("MIDI file %1 was not readable (no reason available)"), source->file_path()) << endmsg;
        }
 
        if (buf) {
@@ -526,7 +525,7 @@ Session::import_files (ImportStatus& status)
                        fatal << "THIS IS NOT IMPLEMENTED YET, IT SHOULD NEVER GET CALLED!!! DYING!" << endmsg;
                        status.cancel = !map_existing_mono_sources (new_paths, *this, frame_rate(), newfiles, this);
                } else {
-                       status.cancel = !create_mono_sources_for_writing (*p, new_paths, *this, frame_rate(), newfiles, natural_position);
+                       status.cancel = !create_mono_sources_for_writing (new_paths, *this, frame_rate(), newfiles, natural_position);
                }
 
                // copy on cancel/failure so that any files that were created will be removed below