X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audio_import.cc;h=2eb8b9140a08cd2801d3f088b038ce439be55b31;hb=1315ee3dff1e4966ab28bd47e81b5f003cac6e40;hp=2f63de340ec6d51ac6b5619877d12b005f547bbe;hpb=0eafb1f3005d0ddf9f8ce8c6bde30f0ac641aa61;p=ardour.git

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 2f63de340e..2eb8b9140a 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -263,7 +263,7 @@ Editor::import_sndfile (vector<ustring> paths, ImportMode mode, AudioTrack* trac
 	/* import thread finished - see if we should build a new track */
 	
 	if (!import_status.new_regions.empty()) {
-		boost::shared_ptr<AudioRegion> region (import_status.new_regions.front());
+		boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(import_status.new_regions.front());
 		finish_bringing_in_audio (region, region->n_channels(), region->n_channels(), track, pos, mode);
 	}
 
@@ -402,7 +402,7 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
 
 				if ((s = session->source_by_path_and_channel (path, n)) == 0) {
 					source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable 
-											       (*session, path,  n,
+											       (DataType::AUDIO, *session, path,  n,
 												(mode == ImportAsTapeTrack ? 
 												 AudioFileSource::Destructive : 
 												 AudioFileSource::Flag (0))));
@@ -436,7 +436,7 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
 										  Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
 
 	if (Config->get_output_auto_connect() & AutoConnectMaster) {
-		output_chan = (session->master_out() ? session->master_out()->n_inputs() : input_chan);
+		output_chan = (session->master_out() ? session->master_out()->n_inputs().n_audio() : input_chan);
 	} else {
 		output_chan = input_chan;
 	}