diff options
author | Robin Gareus <robin@gareus.org> | 2013-08-08 20:08:20 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-08-08 20:08:20 +0200 |
commit | 897074730a3b11d7d0fe8d1ff3250e9aa2628907 (patch) | |
tree | 88b9d802e08d51c3c208e0146b01102709e217d3 | |
parent | 5bca1f44fe3c023cc8421289b9788de578604a36 (diff) |
remove --no-freesound option. fixes #5640
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 7 | ||||
-rw-r--r-- | gtk2_ardour/wscript | 5 | ||||
-rw-r--r-- | wscript | 6 |
3 files changed, 1 insertions, 17 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; diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index bb4e2035ec..4cc9b40cdb 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -103,6 +103,7 @@ gtk2_ardour_sources = [ 'fft.cc', 'fft_graph.cc', 'fft_result.cc', + 'sfdb_freesound_mootcher.cc', 'gain_meter.cc', 'generic_pluginui.cc', 'ghostregion.cc', @@ -434,10 +435,6 @@ def build(bld): obj.source += [ 'lv2_plugin_ui.cc' ] obj.use += [ 'SUIL' ] - if bld.is_defined('FREESOUND'): - obj.source += [ 'sfdb_freesound_mootcher.cc' ] - obj.defines += [ 'FREESOUND' ] - if bld.is_defined('NEED_INTL'): obj.linkflags = ' -lintl' @@ -418,8 +418,6 @@ def options(opt): help='Install MIME type, icons and .desktop file as per freedesktop.org standards') opt.add_option('--freebie', action='store_true', default=False, dest='freebie', help='Build a version suitable for distribution as a zero-cost binary') - opt.add_option('--no-freesound', action='store_false', default=True, dest='freesound', - help='Do not build with Freesound database support') opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile', help='Compile for use with gprofile') opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs', @@ -642,9 +640,6 @@ def configure(conf): conf.env['PHONE_HOME'] = True if opts.fpu_optimization: conf.env['FPU_OPTIMIZATION'] = True - if opts.freesound: - conf.define('FREESOUND',1) - conf.env['FREESOUND'] = True if opts.nls: conf.define('ENABLE_NLS', 1) conf.env['ENABLE_NLS'] = True @@ -718,7 +713,6 @@ const char* const ardour_config_info = "\\n\\ write_config_text('FLAC', conf.is_defined('HAVE_FLAC')) write_config_text('FPU optimization', opts.fpu_optimization) write_config_text('Freedesktop files', opts.freedesktop) - write_config_text('Freesound', opts.freesound) write_config_text('JACK session support', conf.is_defined('JACK_SESSION')) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) |