Merge branch 'master' into ccmerge
Conflicts: gtk2_ardour/ardour_ui_options.cc gtk2_ardour/generic_pluginui.cc gtk2_ardour/level_meter.cc gtk2_ardour/utils.cc gtk2_ardour/utils.h gtk2_ardour/video_image_frame.cc
This commit is contained in:
commit
cc92c879bf
Binary file not shown.
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -93,6 +93,7 @@ gtk2_ardour_sources = [
|
|||
'fft.cc',
|
||||
'fft_graph.cc',
|
||||
'fft_result.cc',
|
||||
'sfdb_freesound_mootcher.cc',
|
||||
'gain_meter.cc',
|
||||
'generic_pluginui.cc',
|
||||
'ghostregion.cc',
|
||||
|
@ -424,10 +425,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'
|
||||
|
||||
|
|
6
wscript
6
wscript
|
@ -421,8 +421,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',
|
||||
|
@ -645,9 +643,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
|
||||
|
@ -721,7 +716,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'))
|
||||
|
|
Loading…
Reference in New Issue