X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=6f9443026d2dfcdd0dcd4701f0d5b93bf40d3b8d;hb=4c4061359cb33011e3acab016e8e604cd413a93d;hp=11a53c426873a8527a95615a018d9bc503ea9365;hpb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;p=ardour.git

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 11a53c4268..6f9443026d 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -58,7 +58,7 @@
 #include "mouse_cursors.h"
 #include "editor_cursors.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -484,6 +484,7 @@ Editor::import_sndfiles (vector<string>            paths,
 	import_status.freeze = false;
 	import_status.quality = quality;
 	import_status.replace_existing_source = replace;
+	import_status.split_midi_channels = (disposition == Editing::ImportDistinctChannels);
 
 	import_status.mode = mode;
 	import_status.pos = pos;
@@ -953,8 +954,10 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
 				list<boost::shared_ptr<MidiTrack> > mt (
 					_session->new_midi_track (ChanCount (DataType::MIDI, 1),
 					                          ChanCount (DataType::MIDI, 1),
-					                          instrument,
-					                          0, 1, string(),
+					                          instrument, (Plugin::PresetRecord*) 0,
+					                          (RouteGroup*) 0,
+					                          1,
+					                          string(),
 					                          PresentationInfo::max_order));
 
 				if (mt.empty()) {