X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=c473a4569bf4b43a92fe7862d54eb216476bb4f2;hb=e1b0f1bd0b03c071d2b5987e4ab75ef059e32111;hp=338a585dca333a0456643215610b0020625a9ba3;hpb=a2897ecef6da6a458aa1de8c2d9973a1e809dca2;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 338a585dca..c473a4569b 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -52,24 +52,15 @@ 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', - 'canvas-hit.cc', - 'canvas-note-event.cc', - 'canvas-note.cc', - 'canvas_patch_change.cc', - 'canvas-simpleline.c', - 'canvas-simplerect.c', - 'canvas-sysex.cc', - 'canvas-waveview.c', 'clock_group.cc', 'configinfo.cc', 'control_point.cc', 'control_point_dialog.cc', 'curvetest.cc', 'debug.cc', - 'diamond.cc', 'edit_note_dialog.cc', 'editing.cc', 'editor.cc', @@ -93,7 +84,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', @@ -124,19 +114,21 @@ gtk2_ardour_sources = [ 'insert_time_dialog.cc', 'interthread_progress_window.cc', 'io_selector.cc', + 'hit.cc', 'keyboard.cc', 'keyeditor.cc', 'latency_gui.cc', 'led.cc', 'level_meter.cc', - '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', @@ -145,6 +137,7 @@ 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', @@ -153,17 +146,25 @@ gtk2_ardour_sources = [ 'mixer_ui.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.cc', + 'note_base.cc', 'note_player.cc', + 'nsm.cc', + 'nsmclient.cc', 'option_editor.cc', 'opts.cc', 'panner2d.cc', + 'panner_editor.cc', 'panner_interface.cc', 'panner_ui.cc', + 'patch_change.cc', 'piano_roll_header.cc', + 'pingback.cc', 'playlist_selector.cc', 'plugin_eq_gui.cc', 'plugin_selector.cc', @@ -205,16 +206,16 @@ gtk2_ardour_sources = [ 'session_option_editor.cc', 'sfdb_ui.cc', 'shuttle_control.cc', - 'simpleline.cc', - 'simplerect.cc', 'splash.cc', 'speaker_dialog.cc', 'startup.cc', 'step_editor.cc', 'step_entry.cc', 'stereo_panner.cc', + 'stereo_panner_editor.cc', 'streamview.cc', 'strip_silence_dialog.cc', + 'sys_ex.cc', 'tape_region_view.cc', 'tempo_dialog.cc', 'tempo_lines.cc', @@ -233,8 +234,20 @@ gtk2_ardour_sources = [ 'version.cc', '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): @@ -262,12 +275,9 @@ def configure(conf): atleast_version='2.18') autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18') - autowaf.check_pkg(conf, 'libgnomecanvas-2.0', - uselib_store='GNOMECANVAS', atleast_version='2.30') - 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) @@ -362,10 +372,12 @@ def build(bld): 'libardour_cp', 'libgtk2_ardour', 'libgtkmm2ext', - 'libtaglib' ] + 'libtaglib', + 'libcanvas' + ] obj.target = 'ardour-3.0-vst.exe.so' obj.includes = [ '../libs/fst', '.' ] - obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread'] + 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 @@ -388,47 +400,49 @@ def build(bld): 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 GTKMM LO' obj.use = [ 'libpbd', 'libmidipp', 'libtaglib', 'libardour', 'libardour_cp', 'libgtkmm2ext', - 'libtaglib' ] + 'libtaglib', + 'libcanvas' + ] if sys.platform == 'darwin': - obj.use += ' libappleutility' + obj.uselib += ' AUDIOUNITS OSX GTKOSX' + obj.use += ' libappleutility' obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"', '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' ] @@ -449,6 +463,8 @@ def build(bld): 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' @@ -493,30 +509,42 @@ 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', + '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 @@ -539,6 +567,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') @@ -608,6 +642,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 @@ -615,6 +650,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') @@ -641,11 +677,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'))