X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fwscript;h=ddafbb9e3a4fdd0502c388973ab784e1512f8c8f;hb=85fd343145c3ce1e2e5804c75aeccd03cf2c38a3;hp=9873fb328ed7c09cf37270e4bbbca90b2fe9f110;hpb=2c7c706778a401d1e24cfe63c5db0ac446db9331;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 9873fb328e..ddafbb9e3a 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -8,15 +8,6 @@ import re import time from waflib.Task import Task -# Version of this package (even if built as a child) -MAJOR = '3' -MINOR = '0' -MICRO = '0' -GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) - -# Variables for 'waf dist' -APPNAME = 'gtk2_ardour3' -VERSION = GTK2_ARDOUR_VERSION I18N_PACKAGE = 'gtk2_ardour3' # Mandatory variables @@ -28,7 +19,6 @@ path_prefix = 'gtk2_ardour/' gtk2_ardour_sources = [ 'about.cc', 'actions.cc', - 'add_midi_cc_track_dialog.cc', 'add_route_dialog.cc', 'ambiguous_file_dialog.cc', 'analysis_window.cc', @@ -53,6 +43,7 @@ gtk2_ardour_sources = [ 'automation_streamview.cc', 'automation_time_axis.cc', 'axis_view.cc', + 'big_clock_window.cc', 'bundle_manager.cc', 'button_joiner.cc', 'canvas-flag.cc', @@ -68,8 +59,6 @@ gtk2_ardour_sources = [ 'configinfo.cc', 'control_point.cc', 'control_point_dialog.cc', - 'crossfade_edit.cc', - 'crossfade_view.cc', 'curvetest.cc', 'debug.cc', 'diamond.cc', @@ -96,7 +85,6 @@ gtk2_ardour_sources = [ 'editor_regions.cc', 'editor_routes.cc', 'editor_rulers.cc', - 'editor_scrub.cc', 'editor_selection.cc', 'editor_snapshots.cc', 'editor_summary.cc', @@ -115,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', @@ -135,11 +124,13 @@ gtk2_ardour_sources = [ 'lineset.cc', 'location_ui.cc', 'main.cc', + 'main_clock.cc', 'marker.cc', 'midi_automation_line.cc', 'midi_channel_dialog.cc', 'midi_channel_selector.cc', 'midi_cut_buffer.cc', + 'midi_export_dialog.cc', 'midi_list_editor.cc', 'midi_port_dialog.cc', 'midi_region_view.cc', @@ -148,25 +139,34 @@ gtk2_ardour_sources = [ 'midi_streamview.cc', 'midi_time_axis.cc', 'midi_tracer.cc', + 'midi_velocity_dialog.cc', 'missing_file_dialog.cc', 'missing_plugin_dialog.cc', 'mixer_actor.cc', 'mixer_group_tabs.cc', 'mixer_strip.cc', 'mixer_ui.cc', + 'meterbridge.cc', + 'meter_strip.cc', + 'meter_patterns.cc', 'monitor_section.cc', 'mono_panner.cc', + 'mono_panner_editor.cc', 'mouse_cursors.cc', 'nag.cc', 'new_plugin_preset_dialog.cc', 'normalize_dialog.cc', 'note_player.cc', + 'nsm.cc', + 'nsmclient.cc', 'option_editor.cc', 'opts.cc', 'panner2d.cc', + 'panner_editor.cc', 'panner_interface.cc', 'panner_ui.cc', 'piano_roll_header.cc', + 'pingback.cc', 'playlist_selector.cc', 'plugin_eq_gui.cc', 'plugin_selector.cc', @@ -203,6 +203,7 @@ gtk2_ardour_sources = [ 'search_path_option.cc', 'selection.cc', 'send_ui.cc', + 'session_dialog.cc', 'session_import_dialog.cc', 'session_metadata_dialog.cc', 'session_option_editor.cc', @@ -216,6 +217,7 @@ gtk2_ardour_sources = [ 'step_editor.cc', 'step_entry.cc', 'stereo_panner.cc', + 'stereo_panner_editor.cc', 'streamview.cc', 'strip_silence_dialog.cc', 'tape_region_view.cc', @@ -237,7 +239,20 @@ gtk2_ardour_sources = [ 'visibility_group.cc', 'volume_controller.cc', 'waveview.cc', - 'window_proxy.cc' + 'window_manager.cc', +# video-timeline related sources: + 'video_image_frame.cc', + 'add_video_dialog.cc', + 'editor_videotimeline.cc', + 'video_timeline.cc', + 'system_exec.cc', + 'video_monitor.cc', + 'transcode_ffmpeg.cc', + 'transcode_video_dialog.cc', + 'video_server_dialog.cc', + 'utils_videotl.cc', + 'export_video_dialog.cc', + 'export_video_infobox.cc' ] def options(opt): @@ -246,10 +261,11 @@ def options(opt): def configure(conf): conf.load('misc') conf.load('compiler_cxx') + # we don't use hard-coded micro versions with ardour, so hard code it to zero autowaf.build_version_files( path_prefix + 'version.h', path_prefix + 'version.cc', - 'gtk2_ardour', MAJOR, MINOR, MICRO) + 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0) autowaf.configure(conf) if re.search ("linux", sys.platform) != None: @@ -257,6 +273,8 @@ def configure(conf): # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present + autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', + mandatory=True) autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', @@ -270,7 +288,8 @@ def configure(conf): autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16') autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2') - autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.3', mandatory=False) + autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.1', mandatory=False) + autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG') conf.write_config_header('gtk2ardour-config.h', remove=False) @@ -345,30 +364,61 @@ def build_color_scheme(path, prefix): return color_scheme def build(bld): - # GTK front-end; if we're using VST we build this as a shared library, - # otherwise it's a normal executabale + + VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) + if bld.is_defined('WINDOWS_VST_SUPPORT'): - obj = bld(features = 'cxx c cxxshlib') + # If we require VST support we build a stub main() and the FST library + # here using winegcc, and link it to the GTK front-end library + obj = bld(features = 'cxx c cxxprogram wine') + obj.source = ''' + ../libs/fst/fst.c + ../libs/fst/fstinfofile.c + ../libs/fst/vsti.c + ../libs/fst/vstwin.c + ../vst/winmain.c + ''' + obj.uselib = 'ALSA' + obj.use = [ 'libpbd', + 'libmidipp', + 'libtaglib', + 'libardour', + 'libardour_cp', + 'libgtk2_ardour', + 'libgtkmm2ext', + 'libtaglib'] + obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' + obj.includes = [ '../libs/fst', '.' ] + obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] + obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] + obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + # end of the wine executable + + # now the shared library containing the GTK GUI for ardour + obj = bld (features = 'cxx c cxxshlib') + obj.source = gtk2_ardour_sources + obj.includes = [ '../libs/fst', '.' ] + obj.name = 'libgtk2_ardour' + obj.target = 'gtk2_ardour' else: + # just the normal executable version of the GTK GUI obj = bld(features = 'cxx c cxxprogram') + obj.source = gtk2_ardour_sources + obj.target = 'ardour-' + bld.env['VERSION'] + obj.includes = ['.'] + + # continue with setup of obj, which could be a shared library + # or an executable. - obj.includes = ['.'] - obj.source = gtk2_ardour_sources - obj.name = 'gtk2_ardour' - obj.linkflags = [] - if bld.is_defined('WINDOWS_VST_SUPPORT'): - obj.target = 'gtk2_ardour' - obj.includes += ['../libs/fst'] - else: - obj.target = 'ardour-3.0' obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL' - obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS ' - obj.uselib += ' AUDIOUNITS OSX GTKOSX ' + + obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL' + obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F' + obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' obj.use = [ 'libpbd', 'libmidipp', 'libtaglib', - 'libardour', + 'ardour', 'libardour_cp', 'libgtkmm2ext', 'libtaglib' ] @@ -379,30 +429,27 @@ def build(bld): 'VERSIONSTRING="' + bld.env['VERSION'] + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', - 'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"', - 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), - 'locale') + '"', + 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' ] obj.includes += ['../libs'] if bld.is_defined('HAVE_SUIL'): obj.source += [ 'lv2_plugin_ui.cc' ] - obj.uselib += ' SUIL ' + 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' if bld.is_defined('WINDOWS_VST_SUPPORT'): obj.source += [ 'windows_vst_plugin_ui.cc' ] obj.defines += [ 'WINDOWS_VST_SUPPORT' ] - obj.uselib += ' X11 ' - + obj.use += [ 'X11' ] + if bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] - obj.uselib += ' X11 ' + obj.use += [ 'X11' ] if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'vst_plugin_ui.cc' ] @@ -418,34 +465,16 @@ def build(bld): if bld.is_defined('AUDIOUNIT_SUPPORT'): obj.source += [ 'au_pluginui.mm' ] - if bld.is_defined('WINDOWS_VST_SUPPORT'): - # If we require VST support we build a stub main() and the FST library - # here using winegcc, and link it to the GTK front-end library - obj = bld(features = 'cxx c cxxprogram wine') - obj.source = ''' - ../libs/fst/fst.c - ../libs/fst/fstinfofile.c - ../libs/fst/vsti.c - ../libs/fst/vstwin.c - ../vst/winmain.c - ''' - obj.includes = '../libs/fst' - obj.target = 'ardour-3.0-vst.exe' - obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread'] - obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] - obj.uselib = 'ALSA' - obj.use = ['libpbd','libmidipp','libtaglib','libardour', - 'libardour_cp','libgtkmm2ext','libtaglib', - 'gtk2_ardour'] - # Wrappers wrapper_subst_dict = { 'INSTALL_PREFIX' : bld.env['PREFIX'], 'LIBDIR' : os.path.normpath(bld.env['LIBDIR']), + 'DATADIR' : os.path.normpath(bld.env['DATADIR']), + 'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']), 'LIBS' : 'build/libs', - 'VERSION' : '3.0', - 'EXECUTABLE' : 'build/gtk2_ardour/ardour-3.0' + 'VERSION' : bld.env['VERSION'], + 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION'] } def set_subst_dict(obj, dict): @@ -487,30 +516,44 @@ def build(bld): if bld.is_defined('GTKOSX'): # OS X fonts basefont = "" font_sizes = { - 'TINY' : '7', 'SMALLER' : '9', 'SMALL' : '10', 'NORMAL' : '11', - 'BIG' : '12', - 'BIGGER' : '14', + 'BIG' : '13', + 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '28', 'HUGER' : '36', - 'MASSIVE' : '60' + 'MASSIVE' : '60', + } + + # There is no acceptable monospace font available on older versions of OS X + # and no API on those versions to load TTF files that will work with + # GTK/fontconfig/pango. + # + # In addition, the ArdourMono font gets clipped for some reason on OS X + # + # Moreover, Lucida Grande just seems to work even though it is not monospace + # so just use it. + # + font_names = { + 'MONOSPACE' : 'Lucida Grande', } else: # Linux/X11 fonts basefont = '' # unspecified - use system defaults font_sizes = { - 'TINY' : '6', 'SMALLER' : '8', 'SMALL' : '9', 'NORMAL' : '10', 'BIG' : '14', - 'BIGGER' : '16', + 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '24', 'HUGER' : '34', - 'MASSIVE' : '60' + 'MASSIVE' : '60', + } + font_names = { + 'MONOSPACE' : 'ArdourMono', } # Set up font substitution dictionary @@ -533,6 +576,12 @@ def build(bld): dark_rc_subst_dict[key] = points light_rc_subst_dict[key] = points + # various font names, eg @BOLD_MONOSPACE@ + for font_sym,text in iter(font_names.items()): + key = font_sym + dark_rc_subst_dict[key] = text + light_rc_subst_dict[key] = text + # RC files dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme( 'gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK') @@ -602,6 +651,7 @@ def build(bld): menus_argv = [ '-E', '-P', '-DGTKOSX' ] else: menus_argv = [ '-E', '-P' ] + obj = bld(features = 'command-output') obj.command = 'cpp' obj.command_is_external = True @@ -609,6 +659,7 @@ def build(bld): obj.argv = menus_argv obj.stdin = 'ardour.menus.in' obj.stdout = 'ardour.menus' + obj.dep_vars = ['GTKOSX'] bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), 'ardour.menus') @@ -635,11 +686,10 @@ def build(bld): bld.install_files('${DATADIR}/ardour3/icons', bld.path.ant_glob('icons/*.png')) bld.install_files('${DATADIR}/ardour3/pixmaps', bld.path.ant_glob('pixmaps/*.xpm')) bld.install_files('${DATADIR}/ardour3', 'splash.png') + bld.install_files('${DATADIR}/ardour3', 'ArdourMono.ttf') # Default UI configuration bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_ui_default.conf') - # Generic widget style mappings - bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_widgets.rc') # Default export stuff bld.install_files('${SYSCONFDIR}/ardour3/export', bld.path.ant_glob('export/*.format'))