X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsfdb_ui.h;h=f070d36ab6daf245313921daac16de4339484ad8;hb=5a8553f02cb9bcbd75b797c6260539f7a8f8e47a;hp=46408ecffc605824912e27daf2749f63de1e15d0;hpb=25a6296f865620d5013cd634e693f7179e7edc84;p=ardour.git

diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 46408ecffc..f070d36ab6 100644
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -50,6 +50,7 @@
 #include "ardour_window.h"
 #include "editing.h"
 #include "audio_clock.h"
+#include "instrument_selector.h"
 
 namespace ARDOUR {
 	class Session;
@@ -71,6 +72,7 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr, public P
 	bool audition_oneshot();
 	bool autoplay () const;
 	void set_src_quality(ARDOUR::SrcQuality q) { _src_quality = q; }
+	void set_import_position(Editing::ImportPosition p) { _import_position = p; }
 
   protected:
 	std::string path;
@@ -119,6 +121,7 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr, public P
 	bool seek_button_release(GdkEventButton*);
 	bool _seeking;
 	ARDOUR::SrcQuality _src_quality;
+	Editing::ImportPosition _import_position;
 };
 
 class SoundFileBrowser : public ArdourWindow
@@ -145,8 +148,8 @@ class SoundFileBrowser : public ArdourWindow
 		Gtk::TreeModelColumn<bool>        started;
 
 		FreesoundColumns() {
-			add(id); 
-			add(filename); 
+			add(id);
+			add(filename);
 			add(uri);
 			add(duration);
 			add(filesize);
@@ -170,9 +173,9 @@ class SoundFileBrowser : public ArdourWindow
 	SoundFileBrowser (std::string title, ARDOUR::Session* _s, bool persistent);
 	virtual ~SoundFileBrowser ();
 
-        int run ();
-        int status () const { return _status; }
-        
+	int run ();
+	int status () const { return _status; }
+
 	virtual void set_session (ARDOUR::Session*);
 	std::vector<std::string> get_paths ();
 
@@ -195,12 +198,12 @@ class SoundFileBrowser : public ArdourWindow
 
 	void freesound_search();
 	void refresh_display(std::string ID, std::string file);
-	
+
   protected:
 	bool resetting_ourselves;
 	int matches;
-        int _status;
-        bool _done;
+	int _status;
+	bool _done;
 
 	Gtk::FileFilter audio_and_midi_filter;
 	Gtk::FileFilter audio_filter;
@@ -208,15 +211,13 @@ class SoundFileBrowser : public ArdourWindow
 	Gtk::FileFilter custom_filter;
 	Gtk::FileFilter matchall_filter;
 	Gtk::HBox hpacker;
-        Gtk::VBox vpacker;
+	Gtk::VBox vpacker;
 
-        Gtk::Button ok_button;
-        Gtk::Button cancel_button;
-        Gtk::Button apply_button;
+	Gtk::Button import_button;
+	Gtk::Button close_button;
 
 	static std::string persistent_folder;
 
-
 	GainMeter* gm;
 	Gtk::VBox meter_packer;
 	void add_gain_meter ();
@@ -238,7 +239,7 @@ class SoundFileBrowser : public ArdourWindow
 	void freesound_more_clicked ();
 	void freesound_similar_clicked ();
 	int freesound_page;
-	
+
 	void chooser_file_activated ();
 	std::string freesound_get_audio_file(Gtk::TreeIter iter);
 
@@ -246,13 +247,13 @@ class SoundFileBrowser : public ArdourWindow
 	bool on_midi_filter (const Gtk::FileFilter::Info& filter_info);
 	bool on_audio_and_midi_filter (const Gtk::FileFilter::Info& filter_info);
 
-        void set_action_sensitive (bool);
+	void set_action_sensitive (bool);
 
-	virtual bool reset_options() { return true; }
+	virtual bool reset_options () { return true; }
 
   protected:
 	void on_show();
-        virtual void do_something (int action);
+	virtual void do_something(int action);
 };
 
 class SoundFileChooser : public SoundFileBrowser
@@ -271,7 +272,7 @@ class SoundFileOmega : public SoundFileBrowser
 {
 
   public:
-	SoundFileOmega (std::string title, ARDOUR::Session* _s, 
+	SoundFileOmega (std::string title, ARDOUR::Session* _s,
 			uint32_t selected_audio_tracks, uint32_t selected_midi_tracks,
 			bool persistent,
 			Editing::ImportMode mode_hint = Editing::ImportAsTrack);
@@ -282,6 +283,7 @@ class SoundFileOmega : public SoundFileBrowser
 	Gtk::ComboBoxText where_combo;
 	Gtk::ComboBoxText channel_combo;
 	Gtk::ComboBoxText src_combo;
+	InstrumentSelector instrument_combo;
 
 	Gtk::CheckButton copy_files_btn;
 
@@ -301,7 +303,7 @@ class SoundFileOmega : public SoundFileBrowser
 	typedef std::map<std::string,Editing::ImportDisposition> DispositionMap;
 	DispositionMap disposition_map;
 
-	Gtk::HBox options;
+	Gtk::Table options;
 	Gtk::VBox block_two;
 	Gtk::VBox block_three;
 	Gtk::VBox block_four;
@@ -316,8 +318,12 @@ class SoundFileOmega : public SoundFileBrowser
 	void reset_options_noret ();
 	bool bad_file_message ();
 	void src_combo_changed ();
+	void where_combo_changed ();
+
+	void do_something (int action);
 
-        void do_something (int action);
+	bool _import_active;
+	bool _reset_post_import;
 };
 
 #endif // __ardour_sfdb_ui_h__