use ustring more; handle embedding of "paired" files as per mantis #1362

git-svn-id: svn://localhost/ardour2/trunk@1241 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 189 insertions, 108 deletions

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 6e302b93d6..5aa0ca5624 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -926,8 +926,8 @@ class Editor : public PublicEditor
 	void bring_in_external_audio (Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t& pos, bool prompt);
 	void do_import (vector<Glib::ustring> paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool);
 	void do_embed (vector<Glib::ustring> paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool);
-	int  import_sndfile (Glib::ustring path, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos);
-	int  embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, 
+	int  import_sndfile (vector<Glib::ustring> paths, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos);
+	int  embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, 
 			    ARDOUR::AudioTrack* track, nframes_t& pos, bool prompt);
 	int finish_bringing_in_audio (boost::shared_ptr<ARDOUR::AudioRegion> region, uint32_t, uint32_t, ARDOUR::AudioTrack* track, nframes_t& pos, Editing::ImportMode mode);
 
@@ -958,7 +958,7 @@ class Editor : public PublicEditor
 	/* to support this ... */
 
 	void import_audio (bool as_tracks);
-	void do_import (vector<string> paths, bool split, bool as_tracks);
+	void do_import (vector<Glib::ustring> paths, bool split, bool as_tracks);
 
 	void move_to_start ();
 	void move_to_end ();
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 56bdc82ff7..7067d9dce0 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -49,6 +49,7 @@ using namespace PBD;
 using namespace sigc;
 using namespace Gtk;
 using namespace Editing;
+using Glib::ustring;
 
 /* Functions supporting the incorporation of external (non-captured) audio material into ardour */
 
@@ -95,7 +96,7 @@ Editor::bring_in_external_audio (ImportMode mode, AudioTrack* track, nframes_t&
 }
 
 void
-Editor::do_import (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt)
+Editor::do_import (vector<ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt)
 {
 	/* SFDB sets "multichan" to true to indicate "split channels"
 	   so reverse the setting to match the way libardour
@@ -107,49 +108,119 @@ Editor::do_import (vector<Glib::ustring> paths, bool split, ImportMode mode, Aud
 	if (interthread_progress_window == 0) {
 		build_interthread_progress_window ();
 	}
-	
-	/* for each path that was selected, import it and then potentially create a new track
-	   containing the new region as the sole contents.
-	*/
 
-	for (vector<Glib::ustring>::iterator i = paths.begin(); i != paths.end(); ++i ) {
-		import_sndfile (*i, mode, track, pos);
+	vector<ustring> to_import;
+
+	for (vector<ustring>::iterator a = paths.begin(); a != paths.end(); ++a) {
+
+		to_import.clear ();
+		to_import.push_back (*a);
+
+		import_sndfile (to_import, mode, track, pos);
 	}
 
 	interthread_progress_window->hide_all ();
 }
 
 void
-Editor::do_embed (vector<Glib::ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt)
+Editor::do_embed (vector<ustring> paths, bool split, ImportMode mode, AudioTrack* track, nframes_t& pos, bool prompt)
 {
 	bool multiple_files = paths.size() > 1;
 	bool check_sample_rate = true;
-	vector<Glib::ustring>::iterator i;
+	vector<ustring>::iterator a;
+
+	for (a = paths.begin(); a != paths.end(); ) {
 	
-	for (i = paths.begin(); i != paths.end(); ++i) {
-		int ret = embed_sndfile (*i, split, multiple_files, check_sample_rate, mode, track, pos, prompt);
+		Glib::ustring path = *a;
+		Glib::ustring pair_base;
+		vector<ustring> to_embed;
+
+		to_embed.push_back (path);
+		a = paths.erase (a);
+
+		if (path_is_paired (path, pair_base)) {
+
+			ustring::size_type len = pair_base.length();
 
-		if (ret < -1) {
-			break;
+			for (vector<Glib::ustring>::iterator b = paths.begin(); b != paths.end(); ) {
+
+				if (((*b).substr (0, len) == pair_base) && ((*b).length() == path.length())) {
+
+					to_embed.push_back (*b);
+						
+					/* don't process this one again */
+
+					b = paths.erase (b);
+					break;
+
+				} else {
+					++b;
+				}
+			}
 		}
-	}
 
-	if (i == paths.end()) {
+		if (to_embed.size() > 1) {
+
+			vector<string> choices;
+
+			choices.push_back (string_compose (_("Import as a %1 region"),
+							   to_embed.size() > 2 ? _("multichannel") : _("stereo")));
+			choices.push_back (_("Import as multiple regions"));
+			
+			Gtkmm2ext::Choice chooser (string_compose (_("Paired files detected (%1, %2 ...).\nDo you want to:"),
+								   to_embed[0],
+								   to_embed[1]),
+						   choices);
+			
+			if (chooser.run () == 0) {
+				
+				/* keep them paired */
+
+				if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) {
+					break;
+				}
+
+			} else {
+
+				/* one thing per file */
+
+				vector<ustring> foo;
+
+				for (vector<ustring>::iterator x = to_embed.begin(); x != to_embed.end(); ++x) {
+
+					foo.clear ();
+					foo.push_back (*x);
+
+					if (embed_sndfile (foo, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) {
+						break;
+					}
+				}
+			}
+
+		} else {
+			
+			if (embed_sndfile (to_embed, split, multiple_files, check_sample_rate, mode, track, pos, prompt) < -1) {
+				break;
+			}
+		}
+	}
+	
+	if (a == paths.end()) {
 		session->save_state ("");
 	}
 }
 
 int
-Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track, nframes_t& pos)
+Editor::import_sndfile (vector<ustring> paths, ImportMode mode, AudioTrack* track, nframes_t& pos)
 {
-	interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), path));
+	interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), paths.front()));
 	interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
 	interthread_progress_window->show_all ();
 	interthread_progress_bar.set_fraction (0.0f);
 	interthread_cancel_label.set_text (_("Cancel Import"));
 	current_interthread_info = &import_status;
 
-	import_status.pathname = path;
+	import_status.paths = paths;
 	import_status.done = false;
 	import_status.cancel = false;
 	import_status.freeze = false;
@@ -161,8 +232,8 @@ Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track,
 	track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
 	ARDOUR_UI::instance()->flush_pending ();
 
-	/* start import thread for this path. this will ultimately call Session::import_audiofile()
-	   and if successful will add the file as a region to the session region list.
+	/* start import thread for this spec. this will ultimately call Session::import_audiofile()
+	   and if successful will add the file(s) as a region to the session region list.
 	*/
 	
 	pthread_create_and_store ("import", &import_status.thread, 0, _import_thread, this);
@@ -187,7 +258,7 @@ Editor::import_sndfile (Glib::ustring path, ImportMode mode, AudioTrack* track,
 }
 
 int
-Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode, 
+Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_files, bool& check_sample_rate, ImportMode mode, 
 		       AudioTrack* track, nframes_t& pos, bool prompt)
 {
 	boost::shared_ptr<AudioFileSource> source;
@@ -196,96 +267,104 @@ Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool
 	string idspec;
 	string linked_path;
 	SoundFileInfo finfo;
-	string region_name;
-	uint32_t input_chan;
-	uint32_t output_chan;
+	ustring region_name;
+	uint32_t input_chan = 0;
+	uint32_t output_chan = 0;
 
 	track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
 	ARDOUR_UI::instance()->flush_pending ();
 
-	/* lets see if we can link it into the session */
-	
-	linked_path = session->sound_dir();
-	linked_path += Glib::path_get_basename (path);
-
-	if (link (path.c_str(), linked_path.c_str()) == 0) {
+	for (vector<Glib::ustring>::iterator p = paths.begin(); p != paths.end(); ++p) {
 
-		/* there are many reasons why link(2) might have failed.
-		   but if it succeeds, we now have a link in the
-		   session sound dir that will protect against
-		   unlinking of the original path. nice.
-		*/
-
-		path = linked_path;
-	}
+		ustring path = *p;
 
-	/* note that we temporarily truncated _id at the colon */
-
-	string error_msg;
-
-	if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) {
-		error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), selection, error_msg ) << endmsg;
-		return 0;
-	}
-	
-	if (check_sample_rate  && (finfo.samplerate != (int) session->frame_rate())) {
-		vector<string> choices;
+		/* lets see if we can link it into the session */
 		
-		if (multiple_files) {
-			choices.push_back (_("Cancel entire import"));
-			choices.push_back (_("Don't embed it"));
-			choices.push_back (_("Embed all without questions"));
-		} else {
-			choices.push_back (_("Cancel"));
+		linked_path = session->sound_dir();
+		linked_path += '/';
+		linked_path += Glib::path_get_basename (path);
+		
+		if (link (path.c_str(), linked_path.c_str()) == 0) {
+			
+			/* there are many reasons why link(2) might have failed.
+			   but if it succeeds, we now have a link in the
+			   session sound dir that will protect against
+			   unlinking of the original path. nice.
+			*/
+			
+			path = linked_path;
 		}
-
-		choices.push_back (_("Embed it anyway"));
 		
-		Gtkmm2ext::Choice rate_choice (
-			string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
-			choices, false);
+		/* note that we temporarily truncated _id at the colon */
 		
-		switch (rate_choice.run()) {
-		case 0: /* stop a multi-file import */
-		case 1: /* don't import this one */
-			return -1;
-		case 2: /* do it, and the rest without asking */
-			check_sample_rate = false;
-			break;
-		case 3: /* do it */
-			break;
-		default:
-			return -2;
-		}
-	}
-	
-	track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
-	ARDOUR_UI::instance()->flush_pending ();
-	
-	/* make the proper number of channels in the region */
-
-	for (int n = 0; n < finfo.channels; ++n)
-	{
-		idspec = path;
-		idspec += string_compose(":%1", n);
+		string error_msg;
 		
-		try {
-			source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable 
-									       (*session, idspec, 
-										(mode == ImportAsTapeTrack ? 
-										 AudioFileSource::Destructive : 
-										 AudioFileSource::Flag (0))));
-			sources.push_back(source);
-		} 
+		if (!AudioFileSource::get_soundfile_info (path, finfo, error_msg)) {
+			error << string_compose(_("Editor: cannot open file \"%1\", (%2)"), selection, error_msg ) << endmsg;
+			return 0;
+		}
 		
-		catch (failed_constructor& err) {
-			error << string_compose(_("could not open %1"), path) << endmsg;
-			goto out;
+		if (check_sample_rate  && (finfo.samplerate != (int) session->frame_rate())) {
+			vector<string> choices;
+			
+			if (multiple_files) {
+				choices.push_back (_("Cancel entire import"));
+				choices.push_back (_("Don't embed it"));
+				choices.push_back (_("Embed all without questions"));
+			} else {
+				choices.push_back (_("Cancel"));
+			}
+			
+			choices.push_back (_("Embed it anyway"));
+			
+			Gtkmm2ext::Choice rate_choice (
+				string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
+				choices, false);
+			
+			switch (rate_choice.run()) {
+			case 0: /* stop a multi-file import */
+			case 1: /* don't import this one */
+				return -1;
+			case 2: /* do it, and the rest without asking */
+				check_sample_rate = false;
+				break;
+			case 3: /* do it */
+				break;
+			default:
+				return -2;
+			}
 		}
 		
+		track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
 		ARDOUR_UI::instance()->flush_pending ();
-	}
 	
+		/* make the proper number of channels in the region */
+		
+		input_chan += finfo.channels;
+	
+		for (int n = 0; n < finfo.channels; ++n)
+		{
+			idspec = path;
+			idspec += string_compose(":%1", n);
+			
+			try {
+				source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable 
+										       (*session, idspec, 
+											(mode == ImportAsTapeTrack ? 
+											 AudioFileSource::Destructive : 
+											 AudioFileSource::Flag (0))));
+				sources.push_back(source);
+			} 
+			
+			catch (failed_constructor& err) {
+				error << string_compose(_("could not open %1"), path) << endmsg;
+				goto out;
+			}
+			
+			ARDOUR_UI::instance()->flush_pending ();
+		}
+	}
+
 	if (sources.empty()) {
 		goto out;
 	}
@@ -294,20 +373,17 @@ Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool
 		pos = sources[0]->natural_position();
 	} 
 
-	region_name = PBD::basename_nosuffix (path);
-	region_name += "-0";
+	region_name = region_name_from_path (paths.front(), (sources.size() > 1));
 	
 	region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (sources, 0, sources[0]->length(), region_name, 0,
 										  Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));
 	
-	input_chan = finfo.channels;
-	
 	if (Config->get_output_auto_connect() & AutoConnectMaster) {
 		output_chan = (session->master_out() ? session->master_out()->n_inputs() : input_chan);
 	} else {
 		output_chan = input_chan;
 	}
-	
+
 	finish_bringing_in_audio (region, input_chan, output_chan, track, pos, mode);
 	
   out:
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 4a1fc10b9c..ed49235a40 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -454,8 +454,6 @@ Editor::track_canvas_drag_data_received (const RefPtr<Gdk::DragContext>& context
 					 const SelectionData& data,
 					 guint info, guint time)
 {
-	cerr << "dropping, target = " << data.get_target() << endl;
-
 	if (data.get_target() == "regions") {
 		drop_regions (context, x, y, data, info, time);
 	} else {
diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index d12d562237..2f2aea7b7d 100644
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -26,7 +26,7 @@
 #include <pbd/basename.h>
 
 #include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
+#include <ardour/audiofilesource.h>
 #include <ardour/session_region.h>
 
 #include <gtkmm2ext/stop_signal.h>
@@ -131,8 +131,15 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio
 
 			if (region->whole_file()) {
 				str = ".../";
-				str += PBD::basename_nosuffix (region->source()->name());
-				
+
+				boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source());
+
+				if (afs) {
+					str += region_name_from_path (afs->path(), region->n_channels() > 1);
+				} else {
+					str += region->source()->name();
+				}
+
 			} else {
 				str = region->name();
 			}