[Summary] Progressing TRACKS specific import dialog.

gtk2_ardour/ardour_ui_dialogs.cc

@@ -52,7 +52,6 @@
 #include "session_option_editor.h"
 #include "speaker_dialog.h"
 #include "splash.h"
-#include "sfdb_ui.h"
 #include "theme_manager.h"
 #include "time_info_box.h"
 

gtk2_ardour/editor.cc

@@ -120,7 +120,6 @@
 #include "rgb_macros.h"
 #include "rhythm_ferret.h"
 #include "selection.h"
-#include "sfdb_ui.h"
 #include "tempo_lines.h"
 #include "time_axis_view.h"
 #include "master_bus_ui.h"
@@ -427,8 +426,6 @@ Editor::Editor ()
 
 	scrubbing_direction = 0;
 
-	sfbrowser = 0;
-
 	zoom_focus = ZoomFocusLeft;
 	_edit_point = EditAtMouse;
 	_internal_editing = false;
@@ -1439,10 +1436,6 @@ Editor::set_session (Session *t)
 		analysis_window->set_session (_session);
 	}
 
-	if (sfbrowser) {
-		sfbrowser->set_session (_session);
-	}
-
 	compute_fixed_ruler_scale ();
 
 	/* Make sure we have auto loop and auto punch ranges */

gtk2_ardour/editor.h

@@ -1251,8 +1251,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	int  check_whether_and_how_to_import(std::string, bool all_or_nothing = true);
 	bool check_multichannel_status (const std::vector<std::string>& paths);
 
-	SoundFileOmega* sfbrowser;
-
 	void bring_in_external_audio (Editing::ImportMode mode,  framepos_t& pos);
 
 	bool  idle_drop_paths  (std::vector<std::string> paths, framepos_t frame, double ypos, bool copy);

gtk2_ardour/editor_audio_import.cc

@@ -48,7 +48,6 @@
 #include "file_sample_rate_mismatch_dialog.h"
 #include "ardour_ui.h"
 #include "editor.h"
-#include "sfdb_ui.h"
 #include "waves_import_dialog.h"
 #include "editing.h"
 #include "audio_time_axis.h"
@@ -74,18 +73,6 @@ using std::string;
 void
 Editor::add_external_audio_action (ImportMode mode_hint)
 {
-	if (_session == 0) {
-		WavesMessageDialog msg ("", _("You can't import or embed an audiofile until you have a session loaded."));
-		msg.run ();
-		return;
-	}
-
-	if (sfbrowser == 0) {
-		sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, 0, true, mode_hint);
-	} else {
-		sfbrowser->set_mode (mode_hint);
-	}
-
 	external_audio_dialog ();
 }
 
@@ -125,15 +112,7 @@ Editor::external_audio_dialog ()
 	}
 
 	WavesImportDialog import_dialog (_session, audio_track_cnt);
-	int result = import_dialog.run_import ();
-
-	if (sfbrowser == 0) {
-		sfbrowser = new SoundFileOmega (_("Add Existing Media"), _session, audio_track_cnt, midi_track_cnt, true);
-	} else {
-		sfbrowser->reset (audio_track_cnt, midi_track_cnt);
-	}
-
-	sfbrowser->show_all ();
+	import_dialog.run_import ();
 }
 
 void

gtk2_ardour/rc_option_editor.cc

@@ -52,7 +52,6 @@
 #include "rc_option_editor.h"
 #include "utils.h"
 #include "midi_port_dialog.h"
-#include "sfdb_ui.h"
 #include "keyboard.h"
 #include "i18n.h"
 
@@ -227,11 +226,13 @@ private:
 
 	void click_browse_clicked ()
 	{
+		/* TRACKs does not use it.
 		SoundFileChooser sfdb (_("Choose Click"));
 
 		if (sfdb.run () == RESPONSE_OK) {
 			click_chosen (sfdb.get_filename());
 		}
+		*/
 	}
 
 	void click_chosen (string const & path)

gtk2_ardour/wscript

@@ -124,7 +124,6 @@ gtk2_ardour_sources = [
         'fft_graph.cc',
         'fft_result.cc',
         'floating_text_entry.cc',
-        'sfdb_freesound_mootcher.cc',
         'gain_meter.cc',
         'generic_pluginui.cc',
         'ghostregion.cc',
@@ -233,7 +232,6 @@ gtk2_ardour_sources = [
         'session_import_dialog.cc',
         'session_metadata_dialog.cc',
         'session_option_editor.cc',
-        'sfdb_ui.cc',
         'shuttle_control.cc',
         'soundcloud_export_selector.cc',
         'splash.cc',