Don't include program-name with <Option name="color-file" />

[ardour.git] / gtk2_ardour / sfdb_ui.h

diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 54314e6f72c601398568976f0825e2a31c621cfa..f070d36ab6daf245313921daac16de4339484ad8 100644 (file)
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -148,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);
@@ -198,7 +198,7 @@ class SoundFileBrowser : public ArdourWindow
 
        void freesound_search();
        void refresh_display(std::string ID, std::string file);
-       
+
   protected:
        bool resetting_ourselves;
        int matches;
@@ -213,9 +213,8 @@ class SoundFileBrowser : public ArdourWindow
        Gtk::HBox hpacker;
        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;
 
@@ -240,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);
 
@@ -273,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);
@@ -304,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;
@@ -322,6 +321,9 @@ class SoundFileOmega : public SoundFileBrowser
        void where_combo_changed ();
 
        void do_something (int action);
+
+       bool _import_active;
+       bool _reset_post_import;
 };
 
 #endif // __ardour_sfdb_ui_h__