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 | |
parent | 4dc1bbff359308ad884c9429d155f772ebb89bc4 (diff) | |
parent | c4227ca706405a79faf43a1d667a6f017388f8af (diff) |
Merge branch 'master' into audioengine
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/export_video_dialog.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 7 | ||||
-rw-r--r-- | gtk2_ardour/transcode_video_dialog.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/wscript | 5 |
4 files changed, 3 insertions, 13 deletions
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index b8f94ac55c..48d09065b7 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -104,7 +104,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s) /* check if ffmpeg can be found */ transcoder = new TranscodeFfmpeg(""); if (!transcoder->ffexec_ok()) { - l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Export is not possible until you install those tools. See the Log widow for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Export is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l->set_line_wrap(); vbox->pack_start (*l, false, false, 8); get_vbox()->pack_start (*vbox, false, false); 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/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc index 3be2450ca7..d4ad8a24ed 100644 --- a/gtk2_ardour/transcode_video_dialog.cc +++ b/gtk2_ardour/transcode_video_dialog.cc @@ -110,7 +110,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile) bool ffok = false; if (!transcoder->ffexec_ok()) { - l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log widow for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l->set_line_wrap(); options_box->pack_start (*l, false, true, 4); aspect_checkbox.set_sensitive(false); diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index f4e1119aeb..1f4c7940f8 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' |