X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsfdb_ui.cc;h=8dacd0dff1d81ce0567acc7c9092596ee76099f7;hb=1ae6d826744c2c9915627357f4ba5db2e5835f16;hp=8d8c10b350568195d13633ea34e13e41e3666efd;hpb=577469a06aa48310ec5cd9a6428f32c35fca5fcb;p=ardour.git

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 8d8c10b350..8dacd0dff1 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -43,7 +43,6 @@
 
 #include "evoral/SMF.hpp"
 
-#include "ardour/amp.h"
 #include "ardour/audio_library.h"
 #include "ardour/auditioner.h"
 #include "ardour/audioregion.h"
@@ -53,7 +52,6 @@
 #include "ardour/source_factory.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
-#include "ardour/profile.h"
 
 #include "ardour_ui.h"
 #include "editing.h"
@@ -63,6 +61,8 @@
 #include "editing.h"
 #include "utils.h"
 #include "gain_meter.h"
+#include "main_clock.h"
+#include "public_editor.h"
 
 #ifdef FREESOUND
 #include "sfdb_freesound_mootcher.h"
@@ -177,6 +177,7 @@ SoundFileBox::SoundFileBox (bool persistent)
 	main_box.pack_start (table, false, false);
 
 	tags_entry.set_editable (true);
+	tags_entry.set_wrap_mode(Gtk::WRAP_WORD);
 	tags_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &SoundFileBox::tags_entry_left));
 
 	Label* label = manage (new Label (_("Tags:")));
@@ -187,10 +188,10 @@ SoundFileBox::SoundFileBox (bool persistent)
 	main_box.pack_start (bottom_box, false, false);
 
 	play_btn.set_image (*(manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON))));
-	play_btn.set_label (_("Play"));
+//	play_btn.set_label (_("Play"));
 
 	stop_btn.set_image (*(manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON))));
-	stop_btn.set_label (_("Stop"));
+//	stop_btn.set_label (_("Stop"));
 
 	bottom_box.set_homogeneous (false);
 	bottom_box.set_spacing (6);
@@ -248,7 +249,7 @@ SoundFileBox::setup_labels (const string& filename)
 		return false;
 	}
 
-	preview_label.set_markup (string_compose ("<b>%1</b>", Glib::path_get_basename (filename)));
+	preview_label.set_markup (string_compose ("<b>%1</b>", Glib::Markup::escape_text (Glib::path_get_basename (filename))));
 	std::string n = sf_info.format_name;
 	if (n.substr (0, 8) == X_("Format: ")) {
 		n = n.substr (8);
@@ -413,175 +414,207 @@ SoundFileBox::save_tags (const vector<string>& tags)
 	Library->save_changes ();
 }
 
-SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::Session* s, bool persistent)
-	: ArdourDialog (parent, title, false, false),
-	  found_list (ListStore::create(found_list_columns)),
-	  freesound_list (ListStore::create(freesound_list_columns)),
-	  chooser (FILE_CHOOSER_ACTION_OPEN),
-	  preview (persistent),
-	  found_search_btn (_("Search")),
-	  found_list_view (found_list),
-	  freesound_search_btn (_("Search")),
-	  freesound_list_view (freesound_list)
+SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persistent)
+	: ArdourWindow (title)
+	, found_list (ListStore::create(found_list_columns))
+	, freesound_list (ListStore::create(freesound_list_columns))
+	, chooser (FILE_CHOOSER_ACTION_OPEN)
+	, preview (persistent)
+	, found_search_btn (_("Search"))
+	, found_list_view (found_list)
+	, freesound_search_btn (_("Search"))
+	, freesound_list_view (freesound_list)
+	, resetting_ourselves (false)
+	, matches (0)
+	, _status (0)
+	, _done (false)
+	, ok_button (Stock::OK)
+	, cancel_button (Stock::CANCEL)
+	, apply_button (Stock::APPLY)
+	, gm (0)
 {
-	resetting_ourselves = false;
-	gm = 0;
-
-	resetting_ourselves = false;
-	gm = 0;
 
 #ifdef GTKOSX
         chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
         chooser.add_shortcut_folder_uri("file:///Library/Audio/Apple Loops");
         chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
-
         chooser.add_shortcut_folder_uri("file:///Volumes");
 #endif
 
 	//add the file chooser
-	{
-		chooser.set_border_width (12);
-
-		audio_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_audio_filter));
-		audio_filter.set_name (_("Audio files"));
 
-		midi_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_midi_filter));
-		midi_filter.set_name (_("MIDI files"));
-
-		matchall_filter.add_pattern ("*.*");
-		matchall_filter.set_name (_("All files"));
+	chooser.set_border_width (12);
+	
+	audio_and_midi_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun (*this, &SoundFileBrowser::on_audio_and_midi_filter));
+	audio_and_midi_filter.set_name (_("Audio and MIDI files"));
+	
+	audio_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_audio_filter));
+	audio_filter.set_name (_("Audio files"));
+	
+	midi_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_midi_filter));
+	midi_filter.set_name (_("MIDI files"));
+	
+	matchall_filter.add_pattern ("*.*");
+	matchall_filter.set_name (_("All files"));
+	
+	chooser.add_filter (audio_and_midi_filter);
+	chooser.add_filter (audio_filter);
+	chooser.add_filter (midi_filter);
+	chooser.add_filter (matchall_filter);
+	chooser.set_select_multiple (true);
+	chooser.signal_update_preview().connect(sigc::mem_fun(*this, &SoundFileBrowser::update_preview));
+	chooser.signal_file_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
 
-		chooser.add_filter (audio_filter);
-		chooser.add_filter (midi_filter);
-		chooser.add_filter (matchall_filter);
-		chooser.set_select_multiple (true);
-		chooser.signal_update_preview().connect(sigc::mem_fun(*this, &SoundFileBrowser::update_preview));
-		chooser.signal_file_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
 #ifdef GTKOSX
-                /* some broken redraw behaviour - this is a bandaid */
-                chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw));
+	/* some broken redraw behaviour - this is a bandaid */
+	chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw));
 #endif
-
-		if (!persistent_folder.empty()) {
-			chooser.set_current_folder (persistent_folder);
-		}
-		notebook.append_page (chooser, _("Browse Files"));
+	
+	if (!persistent_folder.empty()) {
+		chooser.set_current_folder (persistent_folder);
 	}
 
+	notebook.append_page (chooser, _("Browse Files"));
+	
 	hpacker.set_spacing (6);
 	hpacker.pack_start (notebook, true, true);
 	hpacker.pack_start (preview, false, false);
 
-	get_vbox()->pack_start (hpacker, true, true);
-
-	//add tag search
-	{
-		VBox* vbox;
-		HBox* hbox;
+	vpacker.set_spacing (6);
+	vpacker.pack_start (hpacker, true, true);
 
+	add (vpacker);
 
-		hbox = manage(new HBox);
-		hbox->pack_start (found_entry);
-		hbox->pack_start (found_search_btn);
+	//add tag search
 
-		Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow);
-		scroll->add(found_list_view);
-		scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+	VBox* vbox;
+	HBox* hbox;
+	
+	
+	hbox = manage(new HBox);
+	hbox->pack_start (found_entry);
+	hbox->pack_start (found_search_btn);
+	
+	Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow);
+	scroll->add(found_list_view);
+	scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+	
+	vbox = manage(new VBox);
+	vbox->pack_start (*hbox, PACK_SHRINK);
+	vbox->pack_start (*scroll);
+	
+	found_list_view.append_column(_("Paths"), found_list_columns.pathname);
+	
+	found_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_list_view_selected));
+	
+	found_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::found_list_view_activated));
+	
+	found_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+	found_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+	
+	freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked));
+	
+	notebook.append_page (*vbox, _("Search Tags"));
 
-		vbox = manage(new VBox);
-		vbox->pack_start (*hbox, PACK_SHRINK);
-		vbox->pack_start (*scroll);
+#ifdef FREESOUND
 
-		found_list_view.append_column(_("Paths"), found_list_columns.pathname);
+	//add freesound search
 
-		found_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_list_view_selected));
+	mootcher = new Mootcher();
+	
+	HBox* passbox;
+	Label* label;
+	
+	passbox = manage(new HBox);
+	passbox->set_spacing (6);
+	
+	label = manage (new Label);
+	label->set_text (_("Tags:"));
+	passbox->pack_start (*label, false, false);
+	passbox->pack_start (freesound_entry, true, true);
+	
+	label = manage (new Label);
+	label->set_text (_("Sort:"));
+	passbox->pack_start (*label, false, false);
+	passbox->pack_start (freesound_sort, false, false);
+	freesound_sort.clear_items();
+	
+	// Order of the following must correspond with enum sortMethod
+	// in sfdb_freesound_mootcher.h	
+	freesound_sort.append_text(_("None"));
+	freesound_sort.append_text(_("Longest"));
+	freesound_sort.append_text(_("Shortest"));
+	freesound_sort.append_text(_("Newest"));
+	freesound_sort.append_text(_("Oldest"));
+	freesound_sort.append_text(_("Most downloaded"));
+	freesound_sort.append_text(_("Least downloaded"));
+	freesound_sort.append_text(_("Highest rated"));
+	freesound_sort.append_text(_("Lowest rated"));
+	freesound_sort.set_active(0);
+	
+	passbox->pack_start (freesound_search_btn, false, false);
+	passbox->pack_end   (freesound_stop_btn, false, false);
+	freesound_stop_btn.set_label(_("Stop"));
+	
+	scroll = manage(new ScrolledWindow);
+	scroll->add(freesound_list_view);
+	scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+	
+	vbox = manage(new VBox);
+	vbox->set_spacing (3);
+	vbox->pack_start (*passbox, PACK_SHRINK);
+	vbox->pack_start (freesound_progress_bar, PACK_SHRINK);
+	vbox->pack_start (*scroll);
+	
+	freesound_list_view.append_column(_("ID")      , freesound_list_columns.id);
+	freesound_list_view.append_column(_("Filename"), freesound_list_columns.filename);
+	// freesound_list_view.append_column(_("URI")     , freesound_list_columns.uri);
+	freesound_list_view.append_column(_("Duration"), freesound_list_columns.duration);
+	freesound_list_view.append_column(_("Size"), freesound_list_columns.filesize);
+	freesound_list_view.append_column(_("Samplerate"), freesound_list_columns.smplrate);
+	freesound_list_view.append_column(_("License"), freesound_list_columns.license);
+	freesound_list_view.get_column(0)->set_alignment(0.5);
+	freesound_list_view.get_column(1)->set_expand(true);
+	freesound_list_view.get_column(2)->set_alignment(0.5);
+	freesound_list_view.get_column(3)->set_alignment(0.5);
+	freesound_list_view.get_column(4)->set_alignment(0.5);
+	freesound_list_view.get_column(5)->set_alignment(0.5);
+	
+	freesound_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_list_view_selected));
+
+	freesound_list_view.get_selection()->set_mode (SELECTION_MULTIPLE);
+	freesound_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::freesound_list_view_activated));
+	freesound_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
+	freesound_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
+	freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked));
+	notebook.append_page (*vbox, _("Search Freesound"));
+#endif
 
-		found_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::found_list_view_activated));
+	notebook.set_size_request (500, -1);
+	notebook.signal_switch_page().connect (sigc::hide_return (sigc::hide (sigc::hide (sigc::mem_fun (*this, &SoundFileBrowser::reset_options)))));
 
-		found_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_search_clicked));
-		found_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+	set_session (s);
 
-		notebook.append_page (*vbox, _("Search Tags"));
-	}
+	Gtk::HButtonBox* button_box = manage (new HButtonBox);
 
-	//add freesound search
-#ifdef FREESOUND
-	{
-		VBox* vbox;
-		HBox* passbox;
-		Label* label;
-
-		passbox = manage(new HBox);
-		passbox->set_border_width (12);
-		passbox->set_spacing (6);
-
-		label = manage (new Label);
-		label->set_text (_("Tags:"));
-		passbox->pack_start (*label, false, false);
-		passbox->pack_start (freesound_entry, false, false);
-
-		label = manage (new Label);
-		label->set_text (_("Sort:"));
-		passbox->pack_start (*label, false, false);
-		passbox->pack_start (freesound_sort, false, false);
-		freesound_sort.clear_items();
-		
-		// Order of the following must correspond with enum sortMethod
-		// in sfdb_freesound_mootcher.h	
-		freesound_sort.append_text(_("None"));
-		freesound_sort.append_text(_("Longest"));
-		freesound_sort.append_text(_("Shortest"));
-		freesound_sort.append_text(_("Newest"));
-		freesound_sort.append_text(_("Oldest"));
-		freesound_sort.append_text(_("Most downloaded"));
-		freesound_sort.append_text(_("Least downloaded"));
-		freesound_sort.append_text(_("Highest rated"));
-		freesound_sort.append_text(_("Lowest rated"));
-		freesound_sort.set_active(0);
-
-		label = manage (new Label);
-		label->set_text (_("Page:"));
-		passbox->pack_start (*label, false, false);
-		passbox->pack_start (freesound_page, false, false);
-		freesound_page.set_range(1, 1000);
-		freesound_page.set_increments(1, 10);
-		
-		passbox->pack_start (freesound_search_btn, false, false);
-		passbox->pack_start (progress_bar);
-		passbox->pack_end   (freesound_stop_btn, false, false);
-		freesound_stop_btn.set_label(_("Stop"));
-		
-		Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow);
-		scroll->add(freesound_list_view);
-		scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-
-		vbox = manage(new VBox);
-		vbox->pack_start (*passbox, PACK_SHRINK);
-		vbox->pack_start (*scroll);
-
-		freesound_list_view.append_column(_("ID")      , freesound_list_columns.id);
-		freesound_list_view.append_column(_("Filename"), freesound_list_columns.filename);
-		// freesound_list_view.append_column(_("URI")     , freesound_list_columns.uri);
-		freesound_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_list_view_selected));
-
-		freesound_list_view.get_selection()->set_mode (SELECTION_MULTIPLE);
-		freesound_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::freesound_list_view_activated));
-		freesound_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
-		freesound_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
-		freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked));
-		notebook.append_page (*vbox, _("Search Freesound"));
+	button_box->set_layout (BUTTONBOX_END);
+	button_box->pack_start (cancel_button, false, false);
+	cancel_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_CANCEL));
+	if (persistent) {
+		button_box->pack_start (apply_button, false, false);
+		apply_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_APPLY));
 	}
-#endif
 
+	button_box->pack_start (ok_button, false, false);
+	ok_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_OK));
 
-	notebook.set_size_request (500, -1);
-
-	set_session (s);
+	Gtkmm2ext::UI::instance()->set_tip (ok_button, _("Press to import selected files and close this window"));
+	Gtkmm2ext::UI::instance()->set_tip (apply_button, _("Press to import selected files and leave this window open"));
+	Gtkmm2ext::UI::instance()->set_tip (cancel_button, _("Press to close this window without importing any files"));
 
-	add_button (Stock::CANCEL, RESPONSE_CANCEL);
-	add_button (Stock::APPLY, RESPONSE_APPLY);
-	add_button (Stock::OK, RESPONSE_OK);
+	vpacker.pack_end (*button_box, false, false);
 
+	set_wmclass (X_("import"), PROGRAM_NAME);
 }
 
 SoundFileBrowser::~SoundFileBrowser ()
@@ -589,11 +622,40 @@ SoundFileBrowser::~SoundFileBrowser ()
 	persistent_folder = chooser.get_current_folder();
 }
 
+int
+SoundFileBrowser::run ()
+{
+	set_modal (true);
+	show_all ();
+	present ();
+
+	_done = false;
+
+	while (!_done) {
+		gtk_main_iteration ();
+	}
+
+	return _status;
+}
+
+void
+SoundFileBrowser::set_action_sensitive (bool yn)
+{
+	ok_button.set_sensitive (yn);
+	apply_button.set_sensitive (yn);
+}
+
+void
+SoundFileBrowser::do_something (int action)
+{
+	_done = true;
+	_status = action;
+}
 
 void
 SoundFileBrowser::on_show ()
 {
-	ArdourDialog::on_show ();
+	ArdourWindow::on_show ();
 	start_metering ();
 }
 
@@ -625,7 +687,7 @@ SoundFileBrowser::freesound_list_view_activated (const TreeModel::Path&, TreeVie
 void
 SoundFileBrowser::set_session (Session* s)
 {
-	ArdourDialog::set_session (s);
+	ArdourWindow::set_session (s);
 	preview.set_session (s);
 
 	if (_session) {
@@ -696,10 +758,16 @@ SoundFileBrowser::on_midi_filter (const FileFilter::Info& filter_info)
 	return SMFSource::safe_midi_file_extension (filter_info.filename);
 }
 
+bool
+SoundFileBrowser::on_audio_and_midi_filter (const FileFilter::Info& filter_info)
+{
+	return on_audio_filter (filter_info) || on_midi_filter (filter_info);
+}
+
 void
 SoundFileBrowser::update_preview ()
 {
-	if (preview.setup_labels (chooser.get_filename())) {
+	if (preview.setup_labels (chooser.get_preview_filename())) {
 		if (preview.autoplay()) {
 			Glib::signal_idle().connect (sigc::mem_fun (preview, &SoundFileBox::audition_oneshot));
 		}
@@ -710,7 +778,7 @@ void
 SoundFileBrowser::found_list_view_selected ()
 {
 	if (!reset_options ()) {
-		set_response_sensitive (RESPONSE_OK, false);
+		set_action_sensitive (false);
 	} else {
 		string file;
 
@@ -720,9 +788,9 @@ SoundFileBrowser::found_list_view_selected ()
 			TreeIter iter = found_list->get_iter(*rows.begin());
 			file = (*iter)[found_list_columns.pathname];
 			chooser.set_filename (file);
-			set_response_sensitive (RESPONSE_OK, true);
+			set_action_sensitive (true);
 		} else {
-			set_response_sensitive (RESPONSE_OK, false);
+			set_action_sensitive (false);
 		}
 
 		preview.setup_labels (file);
@@ -732,16 +800,13 @@ SoundFileBrowser::found_list_view_selected ()
 void
 SoundFileBrowser::freesound_list_view_selected ()
 {
+	freesound_download_cancel = false;
+
 #ifdef FREESOUND
 	if (!reset_options ()) {
-		set_response_sensitive (RESPONSE_OK, false);
+		set_action_sensitive (false);
 	} else {
 
-		string path;
-		path = Glib::get_home_dir();
-		path += "/Freesound/";
-		Mootcher theMootcher(path.c_str()); // XXX should be a member of SoundFileBrowser
-
 		string file;
 
 		TreeView::Selection::ListHandle_Path rows = freesound_list_view.get_selection()->get_selected_rows ();
@@ -759,19 +824,21 @@ SoundFileBrowser::freesound_list_view_selected ()
 			gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH));
 			gdk_flush();
 
-			freesound_stop = false;
-			file = theMootcher.getAudioFile(ofn, id, uri, this);
+			file = mootcher->getAudioFile(ofn, id, uri, this);
 
 			gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
 
 			if (file != "") {
 				chooser.set_filename (file);
-				set_response_sensitive (RESPONSE_OK, true);
+				set_action_sensitive (true);
 			}
 		} else {
-			set_response_sensitive (RESPONSE_OK, false);
+			set_action_sensitive (false);
 		}
 
+		freesound_progress_bar.set_text(
+			string_compose(P_("found %1 match", "found %1 matches", matches), matches));
+
 		preview.setup_labels (file);
 	}
 #endif
@@ -804,13 +871,15 @@ SoundFileBrowser::found_search_clicked ()
 void
 SoundFileBrowser::freesound_search_clicked ()
 {
+	freesound_search_cancel = false;
 	freesound_search();
 }
 
 void
 SoundFileBrowser::freesound_stop_clicked ()
 {
-	freesound_stop = true;
+	freesound_download_cancel = true;
+	freesound_search_cancel = true;
 }
 
 
@@ -819,85 +888,182 @@ SoundFileBrowser::freesound_search()
 {
 #ifdef FREESOUND
 	freesound_list->clear();
-
-	string path;
-	path = Glib::get_home_dir();
-	path += "/Freesound/";
-	Mootcher theMootcher(path.c_str());
+	freesound_list_view.get_column(1)->set_sizing(TREE_VIEW_COLUMN_GROW_ONLY);
+	matches = 0;
 
 	string search_string = freesound_entry.get_text ();
 	enum sortMethod sort_method = (enum sortMethod) freesound_sort.get_active_row_number();
-	int page = freesound_page.get_value_as_int();
 
 	GdkCursor *prev_cursor;
 	prev_cursor = gdk_window_get_cursor (get_window()->gobj());
 	gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH));
+	freesound_progress_bar.set_fraction(0.0);
 	gdk_flush();
 
-	string theString = theMootcher.searchText(
-		search_string, 
-		page,
-		"", // filter, could do, e.g. "type:wav"
-		sort_method
-	);
+	int freesound_n_pages = 1;
+	for (int page = 1; page <= 99 && page <= freesound_n_pages; page++ ) {
+		
+		std::string prog;
+		if (freesound_n_pages > 1) {
+			freesound_progress_bar.set_fraction(page/(float)freesound_n_pages);
+			prog = string_compose (_("Searching Page %1 of %2, click Stop to cancel"), page, freesound_n_pages);
+		} else {
+			prog = _("Searching, click Stop to cancel");
+		}
+		freesound_progress_bar.set_text(prog);
+		while (Glib::MainContext::get_default()->iteration (false)) {
+			/* do nothing */
+		}
 
-	gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
+		std::string theString = mootcher->searchText(
+			search_string, 
+			page,
+#ifdef GTKOSX
+			"", // OSX eats anything incl mp3
+#else
+			"type:wav OR type:aiff OR type:flac OR type:aif OR type:ogg OR type:oga",
+#endif
+			sort_method
+		);
 
-	XMLTree doc;
-	doc.read_buffer( theString );
-	XMLNode *root = doc.root();
+		XMLTree doc;
+		doc.read_buffer( theString );
+		XMLNode *root = doc.root();
 
-	if (!root) {
-		cerr << "no root XML node!" << endl;
-		return;
-	}
+		if (!root) {
+			error << "no root XML node!" << endmsg;
+			break;
+		}
 
-	if ( strcmp(root->name().c_str(), "response") != 0) {
-		cerr << "root node name == " << root->name() << ", != \"response\"!" << endl;
-		return;
-	}
+		if ( strcmp(root->name().c_str(), "response") != 0) {
+			error << string_compose ("root node name == %1 != \"response\"", root->name()) << endmsg;
+			break;
+		}
 
-	XMLNode *sounds_root = root->child("sounds");
-	
-	if (!sounds_root) {
-		cerr << "no child node \"sounds\" found!" << endl;
-		return;
-	}
-	
-	XMLNodeList sounds = sounds_root->children();
-	XMLNodeConstIterator niter;
-	XMLNode *node;
-	for (niter = sounds.begin(); niter != sounds.end(); ++niter) {
-		node = *niter;
-		if( strcmp( node->name().c_str(), "resource") != 0 ){
-			cerr << "node->name()=" << node->name() << ",!= \"resource\"!" << endl;
-			continue; // return;
+		//find out how many pages are available to search
+		XMLNode *res = root->child("num_pages");
+		if (res) {
+			string result = res->child("text")->content();
+			freesound_n_pages = atoi(result.c_str());
 		}
 
-		// node->dump(cerr, "node:");
+		XMLNode *sounds_root = root->child("sounds");
+		
+		if (!sounds_root) {
+			error << "no child node \"sounds\" found!" << endmsg;
+			break;
+		}
 		
-		XMLNode *id_node  = node->child ("id");
-		XMLNode *uri_node = node->child ("serve");
-		XMLNode *ofn_node = node->child ("original_filename");
+		XMLNodeList sounds = sounds_root->children();
+		if (sounds.size() == 0) {
+			/* nothing found */
+			break;
+		}
+
+		XMLNodeConstIterator niter;
+		XMLNode *node;
+		for (niter = sounds.begin(); niter != sounds.end(); ++niter) {
+			node = *niter;
+			if( strcmp( node->name().c_str(), "resource") != 0 ){
+				error << string_compose ("node->name()=%1 != \"resource\"", node->name()) << endmsg;
+				freesound_search_cancel = true;
+				break;
+			}
 
-		if (id_node && uri_node && ofn_node) {
+			// node->dump(cerr, "node:");
 			
-			std::string  id =  id_node->child("text")->content();
-			std::string uri = uri_node->child("text")->content();
-			std::string ofn = ofn_node->child("text")->content();
+			XMLNode *id_node  = node->child ("id");
+			XMLNode *uri_node = node->child ("serve");
+			XMLNode *ofn_node = node->child ("original_filename");
+			XMLNode *dur_node = node->child ("duration");
+			XMLNode *siz_node = node->child ("filesize");
+			XMLNode *srt_node = node->child ("samplerate");
+			XMLNode *lic_node = node->child ("license");
+
+			if (id_node && uri_node && ofn_node && dur_node && siz_node && srt_node) {
+				
+				std::string  id =  id_node->child("text")->content();
+				std::string uri = uri_node->child("text")->content();
+				std::string ofn = ofn_node->child("text")->content();
+				std::string dur = dur_node->child("text")->content();
+				std::string siz = siz_node->child("text")->content();
+				std::string srt = srt_node->child("text")->content();
+				std::string lic = lic_node->child("text")->content();
+
+				std::string r;
+				// cerr << "id=" << id << ",uri=" << uri << ",ofn=" << ofn << ",dur=" << dur << endl;
+				
+				double duration_seconds = atof(dur.c_str());
+				double h, m, s;
+				char duration_hhmmss[16];
+				if (duration_seconds >= 99 * 60 * 60) {
+					strcpy(duration_hhmmss, ">99h");
+				} else {
+					s = modf(duration_seconds/60, &m) * 60;
+					m = modf(m/60, &h) * 60;
+					sprintf(duration_hhmmss, "%02.fh:%02.fm:%04.1fs",
+						h, m, s
+					);
+				}
 
-			std::string r;
-			// cerr << "id=" << id << ",uri=" << uri << ",ofn=" << ofn << endl;
+				double size_bytes = atof(siz.c_str());
+				char bsize[32];
+				if (size_bytes < 1000) {
+					sprintf(bsize, "%.0f %s", size_bytes, _("B"));
+				} else if (size_bytes < 1000000 ) {
+					sprintf(bsize, "%.1f %s", size_bytes / 1000.0, _("kB"));
+				} else if (size_bytes < 10000000) {
+					sprintf(bsize, "%.1f %s", size_bytes / 1000000.0, _("MB"));
+				} else if (size_bytes < 1000000000) {
+					sprintf(bsize, "%.2f %s", size_bytes / 1000000.0, _("MB"));
+				} else {
+					sprintf(bsize, "%.2f %s", size_bytes / 1000000000.0, _("GB"));
+				}
 
-			TreeModel::iterator new_row = freesound_list->append();
-			TreeModel::Row row = *new_row;
-			
-			row[freesound_list_columns.id      ] = id;
-			row[freesound_list_columns.uri     ] = uri;
-			row[freesound_list_columns.filename] = ofn;
+				/* see http://www.freesound.org/help/faq/#licenses */
+				char shortlicense[64];
+				if(!lic.compare(0, 42, "http://creativecommons.org/licenses/by-nc/")){
+					sprintf(shortlicense, "CC-BY-NC");
+				} else if(!lic.compare(0, 39, "http://creativecommons.org/licenses/by/")) {
+					sprintf(shortlicense, "CC-BY");
+				} else if(!lic.compare("http://creativecommons.org/licenses/sampling+/1.0/")) {
+					sprintf(shortlicense, "sampling+");
+				} else if(!lic.compare(0, 40, "http://creativecommons.org/publicdomain/")) {
+					sprintf(shortlicense, "PD");
+				} else {
+					snprintf(shortlicense, 64, "%s", lic.c_str());
+					shortlicense[63]= '\0';
+				}
+
+ 				TreeModel::iterator new_row = freesound_list->append();
+				TreeModel::Row row = *new_row;
+				
+				row[freesound_list_columns.id      ] = id;
+				row[freesound_list_columns.uri     ] = uri;
+				row[freesound_list_columns.filename] = ofn;
+				row[freesound_list_columns.duration] = duration_hhmmss;
+				row[freesound_list_columns.filesize] = bsize;
+				row[freesound_list_columns.smplrate] = srt;
+				row[freesound_list_columns.license ] = shortlicense;
+				matches++;
 
+			}
 		}
+	
+		if (freesound_search_cancel)
+			break;
+
+	}  //page "for" loop
+
+	gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
+
+	freesound_progress_bar.set_fraction(0.0);
+	if (matches == 0) {
+		freesound_progress_bar.set_text(_("Search returned no results."));
+	} else {
+		freesound_progress_bar.set_text(string_compose(P_("Found %1 match", "Found %1 matches", matches), matches));
 	}
+	freesound_list_view.get_column(1)->set_sizing(TREE_VIEW_COLUMN_AUTOSIZE);
 #endif
 }
 
@@ -934,12 +1100,6 @@ SoundFileBrowser::get_paths ()
 #ifdef FREESOUND
 		typedef TreeView::Selection::ListHandle_Path ListPath;
 
-		string path;
-		path = Glib::get_home_dir();
-		path += "/Freesound/";
-		Mootcher theMootcher(path.c_str()); // XXX should be a member of SoundFileBrowser
-
-
 		ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
 		for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
 			TreeIter iter = freesound_list->get_iter(*i);
@@ -952,8 +1112,7 @@ SoundFileBrowser::get_paths ()
 			gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH));
 			gdk_flush();
 
-			freesound_stop = false;
-			string str = theMootcher.getAudioFile(ofn, id, uri, this);
+			string str = mootcher->getAudioFile(ofn, id, uri, this);
 			if (str != "") {
 				results.push_back (str);
 			}
@@ -985,6 +1144,7 @@ SoundFileOmega::reset_options ()
 		channel_combo.set_sensitive (false);
 		action_combo.set_sensitive (false);
 		where_combo.set_sensitive (false);
+		copy_files_btn.set_active (true);
 		copy_files_btn.set_sensitive (false);
 
 		return false;
@@ -997,7 +1157,7 @@ SoundFileOmega::reset_options ()
 
 		/* if we get through this function successfully, this may be
 		   reset at the end, once we know if we can use hard links
-		   to do embedding
+		   to do embedding (or if we are importing a MIDI file).
 		*/
 
 		if (Config->get_only_copy_imported_files()) {
@@ -1013,6 +1173,13 @@ SoundFileOmega::reset_options ()
 	bool selection_can_be_embedded_with_links = check_link_status (_session, paths);
 	ImportMode mode;
 
+	/* See if we are thinking about importing any MIDI files */
+	vector<string>::iterator i = paths.begin ();
+	while (i != paths.end() && SMFSource::safe_midi_file_extension (*i) == false) {
+		++i;
+	}
+	bool const have_a_midi_file = (i != paths.end ());
+
 	if (check_info (paths, same_size, src_needed, selection_includes_multichannel)) {
 		Glib::signal_idle().connect (sigc::mem_fun (*this, &SoundFileOmega::bad_file_message));
 		return false;
@@ -1021,6 +1188,8 @@ SoundFileOmega::reset_options ()
 	string existing_choice;
 	vector<string> action_strings;
 
+	resetting_ourselves = true;
+
 	if (chooser.get_filter() == &audio_filter) {
 
 		/* AUDIO */
@@ -1049,10 +1218,10 @@ SoundFileOmega::reset_options ()
 				}
 			}
 		}
-
+		
 	}  else {
 
-		/* MIDI */
+		/* MIDI ONLY */
 
 		if (selected_midi_track_cnt > 0) {
 			action_strings.push_back (importmode2string (ImportToTrack));
@@ -1063,8 +1232,6 @@ SoundFileOmega::reset_options ()
 	action_strings.push_back (importmode2string (ImportAsRegion));
 	action_strings.push_back (importmode2string (ImportAsTapeTrack));
 
-	resetting_ourselves = true;
-
 	existing_choice = action_combo.get_active_text();
 
 	set_popdown_strings (action_combo, action_strings);
@@ -1163,17 +1330,26 @@ SoundFileOmega::reset_options ()
 		src_combo.set_sensitive (false);
 	}
 
+	/* We must copy MIDI files or those from Freesound */
+	bool const must_copy = have_a_midi_file || notebook.get_current_page() == 2;
+	
 	if (Config->get_only_copy_imported_files()) {
 
-		if (selection_can_be_embedded_with_links) {
+		if (selection_can_be_embedded_with_links && !must_copy) {
 			copy_files_btn.set_sensitive (true);
 		} else {
+			if (must_copy) {
+				copy_files_btn.set_active (true);
+			}
 			copy_files_btn.set_sensitive (false);
 		}
 
 	}  else {
 
-		copy_files_btn.set_sensitive (true);
+		if (must_copy) {
+			copy_files_btn.set_active (true);
+		}			
+		copy_files_btn.set_sensitive (!must_copy);
 	}
 
 	return true;
@@ -1250,8 +1426,7 @@ SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool&
 bool
 SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths)
 {
-	sys::path path = s->session_directory().sound_path() / "linktest";
-	string tmpdir = path.to_string();
+	std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));
 	bool ret = false;
 
 	if (mkdir (tmpdir.c_str(), 0744)) {
@@ -1282,8 +1457,8 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths
 	return ret;
 }
 
-SoundFileChooser::SoundFileChooser (Gtk::Window& parent, string title, ARDOUR::Session* s)
-	: SoundFileBrowser (parent, title, s, false)
+SoundFileChooser::SoundFileChooser (string title, ARDOUR::Session* s)
+	: SoundFileBrowser (title, s, false)
 {
 	chooser.set_select_multiple (false);
 	found_list_view.get_selection()->set_mode (SELECTION_SINGLE);
@@ -1293,7 +1468,7 @@ SoundFileChooser::SoundFileChooser (Gtk::Window& parent, string title, ARDOUR::S
 void
 SoundFileChooser::on_hide ()
 {
-	ArdourDialog::on_hide();
+	ArdourWindow::on_hide();
 	stop_metering ();
 
 	if (_session) {
@@ -1319,12 +1494,12 @@ SoundFileChooser::get_filename ()
 	return paths.front();
 }
 
-SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, 
+SoundFileOmega::SoundFileOmega (string title, ARDOUR::Session* s, 
 				uint32_t selected_audio_tracks, 
 				uint32_t selected_midi_tracks, 
 				bool persistent,
 				Editing::ImportMode mode_hint)
-	: SoundFileBrowser (parent, title, s, persistent)
+	: SoundFileBrowser (title, s, persistent)
 	, copy_files_btn ( _("Copy files to session"))
 	, selected_audio_track_cnt (selected_audio_tracks)
 	, selected_midi_track_cnt (selected_midi_tracks)
@@ -1350,16 +1525,16 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi
 	where_combo.set_active_text (str.front());
 
 	Label* l = manage (new Label);
-	l->set_text (_("Add files:"));
+	l->set_markup (_("<b>Add files as ...</b>"));
 
-	hbox = manage (new HBox);
-	hbox->set_border_width (12);
-	hbox->set_spacing (6);
-	hbox->pack_start (*l, false, false);
-	hbox->pack_start (action_combo, false, false);
 	vbox = manage (new VBox);
-	vbox->pack_start (*hbox, false, false);
-	options.pack_start (*vbox, false, false);
+	vbox->set_border_width (12);
+	vbox->set_spacing (6);
+	vbox->pack_start (*l, false, false);
+	vbox->pack_start (action_combo, false, false);
+	hbox = manage (new HBox);
+	hbox->pack_start (*vbox, false, false);
+	options.pack_start (*hbox, false, false);
 
 	/* dummy entry for action combo so that it doesn't look odd if we
 	   come up with no tracks selected.
@@ -1372,29 +1547,29 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi
 	action_combo.set_sensitive (false);
 
 	l = manage (new Label);
-	l->set_text (_("Insert at:"));
+	l->set_markup (_("<b>Insert at</b>"));
 
-	hbox = manage (new HBox);
-	hbox->set_border_width (12);
-	hbox->set_spacing (6);
-	hbox->pack_start (*l, false, false);
-	hbox->pack_start (where_combo, false, false);
 	vbox = manage (new VBox);
-	vbox->pack_start (*hbox, false, false);
-	options.pack_start (*vbox, false, false);
+	vbox->set_border_width (12);
+	vbox->set_spacing (6);
+	vbox->pack_start (*l, false, false);
+	vbox->pack_start (where_combo, false, false);
+	hbox = manage (new HBox);
+	hbox->pack_start (*vbox, false, false);
+	options.pack_start (*hbox, false, false);
 
 
 	l = manage (new Label);
-	l->set_text (_("Mapping:"));
+	l->set_markup (_("<b>Mapping</b>"));
 
-	hbox = manage (new HBox);
-	hbox->set_border_width (12);
-	hbox->set_spacing (6);
-	hbox->pack_start (*l, false, false);
-	hbox->pack_start (channel_combo, false, false);
 	vbox = manage (new VBox);
-	vbox->pack_start (*hbox, false, false);
-	options.pack_start (*vbox, false, false);
+	vbox->set_border_width (12);
+	vbox->set_spacing (6);
+	vbox->pack_start (*l, false, false);
+	vbox->pack_start (channel_combo, false, false);
+	hbox = manage (new HBox);
+	hbox->pack_start (*vbox, false, false);
+	options.pack_start (*hbox, false, false);
 
 	str.clear ();
 	str.push_back (_("one track per file"));
@@ -1403,16 +1578,16 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi
 	channel_combo.set_sensitive (false);
 
 	l = manage (new Label);
-	l->set_text (_("Conversion quality:"));
+	l->set_markup (_("<b>Conversion quality</b>"));
 
-	hbox = manage (new HBox);
-	hbox->set_border_width (12);
-	hbox->set_spacing (6);
-	hbox->pack_start (*l, false, false);
-	hbox->pack_start (src_combo, false, false);
 	vbox = manage (new VBox);
-	vbox->pack_start (*hbox, false, false);
-	options.pack_start (*vbox, false, false);
+	vbox->set_border_width (12);
+	vbox->set_spacing (6);
+	vbox->pack_start (*l, false, false);
+	vbox->pack_start (src_combo, false, false);
+	hbox = manage (new HBox);
+	hbox->pack_start (*vbox, false, false);
+	options.pack_start (*hbox, false, false);
 
 	str.clear ();
 	str.push_back (_("Best"));
@@ -1432,11 +1607,18 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi
 
 	copy_files_btn.set_active (true);
 
+	Gtk::Label* copy_label = dynamic_cast<Gtk::Label*>(copy_files_btn.get_child());
+
+	if (copy_label) {
+		copy_label->set_size_request (175, -1);
+		copy_label->set_line_wrap (true);
+	}
+
 	block_four.pack_start (copy_files_btn, false, false);
 
 	options.pack_start (block_four, false, false);
 
-	get_vbox()->pack_start (options, false, false);
+	vpacker.pack_start (options, false, false);
 
 	/* setup disposition map */
 
@@ -1487,7 +1669,7 @@ SoundFileOmega::get_mode () const
 void
 SoundFileOmega::on_hide ()
 {
-	ArdourDialog::on_hide();
+	ArdourWindow::on_hide();
 	if (_session) {
 		_session->cancel_audition();
 	}
@@ -1551,6 +1733,15 @@ SoundFileOmega::reset (uint32_t selected_audio_tracks, uint32_t selected_midi_tr
 {
 	selected_audio_track_cnt = selected_audio_tracks;
 	selected_midi_track_cnt = selected_midi_tracks;
+
+	if (selected_audio_track_cnt == 0 && selected_midi_track_cnt > 0) {
+		chooser.set_filter (midi_filter);
+	} else if (selected_midi_track_cnt == 0 && selected_audio_track_cnt > 0) {
+		chooser.set_filter (audio_filter);
+	} else {
+		chooser.set_filter (audio_and_midi_filter);
+	}
+
 	reset_options ();
 }
 
@@ -1562,13 +1753,59 @@ SoundFileOmega::file_selection_changed ()
 	}
 
 	if (!reset_options ()) {
-		set_response_sensitive (RESPONSE_OK, false);
+		set_action_sensitive (false);
 	} else {
 		if (chooser.get_filenames().size() > 0) {
-			set_response_sensitive (RESPONSE_OK, true);
+			set_action_sensitive (true);
 		} else {
-			set_response_sensitive (RESPONSE_OK, false);
+			set_action_sensitive (false);
 		}
 	}
 }
 
+void
+SoundFileOmega::do_something (int action)
+{
+	SoundFileBrowser::do_something (action);
+
+	if (action == RESPONSE_CANCEL) {
+		hide ();
+		return;
+	}
+
+	/* lets do it */
+	
+	vector<string> paths = get_paths ();
+	ImportPosition pos = get_position ();
+	ImportMode mode = get_mode ();
+	ImportDisposition chns = get_channel_disposition ();
+	framepos_t where;
+	
+	switch (pos) {
+	case ImportAtEditPoint:
+		where = PublicEditor::instance().get_preferred_edit_position ();
+		break;
+	case ImportAtTimestamp:
+		where = -1;
+		break;
+	case ImportAtPlayhead:
+		where = _session->transport_frame();
+		break;
+	case ImportAtStart:
+		where = _session->current_start_frame();
+		break;
+	}
+	
+	SrcQuality quality = get_src_quality();
+	
+	if (copy_files_btn.get_active()) {
+		PublicEditor::instance().do_import (paths, chns, mode, quality, where);
+	} else {
+		PublicEditor::instance().do_embed (paths, chns, mode, where);
+	}
+	
+	if (action == RESPONSE_OK) {
+		hide ();
+	}
+}
+