X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=237fb6776d99d36940340b8f34e22501a55142bc;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=ced2e7cb3d7826436dcd45195f0cc579939955ce;hpb=89ae64c39f65ce8de6a1e2e4ef1f16d7f8dd35f9;p=ardour.git

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index ced2e7cb3d..237fb6776d 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;
@@ -507,7 +507,10 @@ Editor::import_sndfiles (vector<string>            paths,
 		gtk_main_iteration ();
 	}
 
-	import_status.done = true;
+	// wait for thread to terminate
+	while (!import_status.done) {
+		gtk_main_iteration ();
+	}
 
 	int result = -1;
 
@@ -934,7 +937,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
 	{
 		if (!existing_track) {
 			if (ar) {
-				list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, Normal, 0, 1));
+				list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, 0, 1, string(), PresentationInfo::max_order, Normal));
 
 				if (at.empty()) {
 					return -1;
@@ -950,8 +953,11 @@ 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,
-					                          Normal, 0, 1));
+					                          instrument, (Plugin::PresetRecord*) 0,
+					                          (RouteGroup*) 0,
+					                          1,
+					                          string(),
+					                          PresentationInfo::max_order));
 
 				if (mt.empty()) {
 					return -1;
@@ -987,7 +993,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
 			return -1;
 		}
 
-		list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, Destructive));
+		list<boost::shared_ptr<AudioTrack> > at (_session->new_audio_track (in_chans, out_chans, 0, 1, string(), PresentationInfo::max_order, Destructive));
 		if (!at.empty()) {
 			boost::shared_ptr<Playlist> playlist = at.front()->playlist();
 			boost::shared_ptr<Region> copy (RegionFactory::create (region, true));