diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
| commit | cb413146428ce5db5e281d70f2b3b7df27c1aaab (patch) | |
| tree | 4961e9dcb107f2ca1f0a4298faf5135ba8611d92 /gtk2_ardour/sfdb_ui.h | |
| parent | 9aa8af5a28abbb86c9ae86c6991838eb6828d0a9 (diff) | |
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/sfdb_ui.h')
| -rw-r--r-- | gtk2_ardour/sfdb_ui.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h index 6565178bc6..a0be66493c 100644 --- a/gtk2_ardour/sfdb_ui.h +++ b/gtk2_ardour/sfdb_ui.h @@ -117,6 +117,9 @@ class SoundFileBrowser : public ArdourDialog FoundTagColumns found_list_columns; Glib::RefPtr<Gtk::ListStore> found_list; + FoundTagColumns freesound_list_columns; + Glib::RefPtr<Gtk::ListStore> freesound_list; + public: SoundFileBrowser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, bool persistent); virtual ~SoundFileBrowser (); @@ -127,21 +130,31 @@ class SoundFileBrowser : public ArdourDialog void clear_selection (); Gtk::FileChooserWidget chooser; + + SoundFileBox preview; + + Gtk::Entry found_entry; + Gtk::Button found_search_btn; Gtk::TreeView found_list_view; + Gtk::Entry freesound_name_entry; + Gtk::Entry freesound_pass_entry; + Gtk::Entry freesound_entry; + Gtk::Button freesound_search_btn; + Gtk::TreeView freesound_list_view; + + void freesound_search_thread(); + protected: bool resetting_ourselves; Gtk::FileFilter audio_filter; Gtk::FileFilter midi_filter; Gtk::FileFilter matchall_filter; - SoundFileBox preview; Gtk::HBox hpacker; static Glib::ustring persistent_folder; - Gtk::Entry found_entry; - Gtk::Button found_search_btn; Gtk::Notebook notebook; GainMeter* gm; @@ -154,10 +167,15 @@ class SoundFileBrowser : public ArdourDialog sigc::connection metering_connection; void update_preview (); + void found_list_view_selected (); void found_list_view_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*); void found_search_clicked (); + void freesound_list_view_selected (); + void freesound_list_view_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*); + void freesound_search_clicked (); + void chooser_file_activated (); bool on_audio_filter (const Gtk::FileFilter::Info& filter_info); |