diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-09 16:29:23 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-09 16:29:23 -0400 |
commit | f0fcda204444922fc0e1261929aa6fdb84412036 (patch) | |
tree | beeeb2bc14c99c4b0b333980b693f22dab8314cb /gtk2_ardour/sfdb_ui.cc | |
parent | 4dc1bbff359308ad884c9429d155f772ebb89bc4 (diff) | |
parent | c4227ca706405a79faf43a1d667a6f017388f8af (diff) |
Merge branch 'master' into audioengine
Diffstat (limited to 'gtk2_ardour/sfdb_ui.cc')
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 986ed7f985..5f8564374e 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -64,9 +64,7 @@ #include "main_clock.h" #include "public_editor.h" -#ifdef FREESOUND #include "sfdb_freesound_mootcher.h" -#endif #include "i18n.h" @@ -516,8 +514,6 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi notebook.append_page (*vbox, _("Search Tags")); -#ifdef FREESOUND - //add freesound search HBox* passbox; @@ -593,7 +589,6 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi freesound_more_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_more_clicked)); freesound_similar_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_similar_clicked)); notebook.append_page (*vbox, _("Search Freesound")); -#endif notebook.set_size_request (500, -1); notebook.signal_switch_page().connect (sigc::hide_return (sigc::hide (sigc::hide (sigc::mem_fun (*this, &SoundFileBrowser::reset_options))))); @@ -1149,7 +1144,6 @@ SoundFileBrowser::get_paths () results.push_back (str); } } else { -#ifdef FREESOUND ListPath rows = freesound_list_view.get_selection()->get_selected_rows (); for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) { string str = freesound_get_audio_file (freesound_list->get_iter(*i)); @@ -1157,7 +1151,6 @@ SoundFileBrowser::get_paths () results.push_back (str); } } -#endif } return results; |