diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-05-17 10:58:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-05-17 10:58:00 +0000 |
| commit | 89aa30c1511166959b15d7dcf93f35d1f32384a2 (patch) | |
| tree | d7e41ffc41359d5b8fd0d779c17f5d45dc0e6cbe | |
| parent | 86474713798d6fb40c161ae4b319ffa73472d3c1 (diff) | |
Add a new import file filter for audio and MIDI and use it by default (should fix #4880).
git-svn-id: svn://localhost/ardour2/branches/3.0@12318 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/sfdb_ui.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index dc9edf56c6..554ae97e33 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -447,6 +447,9 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S { chooser.set_border_width (12); + audio_and_midi_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun (*this, &SoundFileBrowser::on_audio_and_midi_filter)); + audio_and_midi_filter.set_name (_("Audio and MIDI files")); + audio_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_audio_filter)); audio_filter.set_name (_("Audio files")); @@ -456,6 +459,7 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S matchall_filter.add_pattern ("*.*"); matchall_filter.set_name (_("All files")); + chooser.add_filter (audio_and_midi_filter); chooser.add_filter (audio_filter); chooser.add_filter (midi_filter); chooser.add_filter (matchall_filter); @@ -700,6 +704,12 @@ SoundFileBrowser::on_midi_filter (const FileFilter::Info& filter_info) return SMFSource::safe_midi_file_extension (filter_info.filename); } +bool +SoundFileBrowser::on_audio_and_midi_filter (const FileFilter::Info& filter_info) +{ + return on_audio_filter (filter_info) || on_midi_filter (filter_info); +} + void SoundFileBrowser::update_preview () { diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h index f497477866..249ebf3535 100644 --- a/gtk2_ardour/sfdb_ui.h +++ b/gtk2_ardour/sfdb_ui.h @@ -182,6 +182,7 @@ class SoundFileBrowser : public ArdourDialog protected: bool resetting_ourselves; + Gtk::FileFilter audio_and_midi_filter; Gtk::FileFilter audio_filter; Gtk::FileFilter midi_filter; Gtk::FileFilter custom_filter; @@ -216,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; } |