packaging tweaks for OS X

[ardour.git] / gtk2_ardour / sfdb_ui.h

diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 45ee3e9b649ce0c81de17f3b859d2caee8fe2479..249ebf3535834d6d49662c4b8c0578abc6cc535f 100644 (file)
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -55,6 +55,7 @@ namespace ARDOUR {
 };
 
 class GainMeter;
+class Mootcher;
 
 class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 {
@@ -126,8 +127,14 @@ class SoundFileBrowser : public ArdourDialog
                Gtk::TreeModelColumn<std::string> id;
                Gtk::TreeModelColumn<std::string> uri;
                Gtk::TreeModelColumn<std::string> filename;
-
-               FreesoundColumns() { add(id); add(filename); add(uri); }
+               Gtk::TreeModelColumn<std::string> duration;
+
+               FreesoundColumns() {
+                       add(id); 
+                       add(filename); 
+                       add(uri);
+                       add(duration);
+               }
        };
 
        FoundTagColumns found_list_columns;
@@ -161,15 +168,21 @@ class SoundFileBrowser : public ArdourDialog
        
        Gtk::Button freesound_search_btn;
        Gtk::TreeView freesound_list_view;
-       Gtk::ProgressBar progress_bar;
+       Gtk::ProgressBar freesound_progress_bar;
 
-       bool freesound_stop;
+       bool freesound_search_cancel;
+       bool freesound_download_cancel;
 
        void freesound_search();
+       
+#ifdef FREESOUND
+       Mootcher *mootcher;
+#endif
 
   protected:
        bool resetting_ourselves;
 
+       Gtk::FileFilter audio_and_midi_filter;
        Gtk::FileFilter audio_filter;
        Gtk::FileFilter midi_filter;
        Gtk::FileFilter custom_filter;
@@ -204,6 +217,7 @@ class SoundFileBrowser : public ArdourDialog
 
        bool on_audio_filter (const Gtk::FileFilter::Info& filter_info);
        bool on_midi_filter (const Gtk::FileFilter::Info& filter_info);
+       bool on_audio_and_midi_filter (const Gtk::FileFilter::Info& filter_info);
 
        virtual bool reset_options() { return true; }