projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix crash during session deletion as monitor section tries to update
[ardour.git]
/
gtk2_ardour
/
wscript
diff --git
a/gtk2_ardour/wscript
b/gtk2_ardour/wscript
index f6d38a92e0cb7d4fc67c763ffe2bac8e5f2b9c2b..84db23987fd41a200d9144d46cc1e7a213fb473e 100644
(file)
--- a/
gtk2_ardour/wscript
+++ b/
gtk2_ardour/wscript
@@
-10,8
+10,6
@@
import time
from waflib.Task import Task
from waflib.Tools import winres
from waflib.Task import Task
from waflib.Tools import winres
-I18N_PACKAGE = 'gtk2_ardour3'
-
# Mandatory variables
top = '.'
out = 'build'
# Mandatory variables
top = '.'
out = 'build'
@@
-55,6
+53,7
@@
gtk2_ardour_sources = [
'configinfo.cc',
'control_point.cc',
'control_point_dialog.cc',
'configinfo.cc',
'control_point.cc',
'control_point_dialog.cc',
+ 'cursor_context.cc',
'curvetest.cc',
'debug.cc',
'edit_note_dialog.cc',
'curvetest.cc',
'debug.cc',
'edit_note_dialog.cc',
@@
-108,6
+107,7
@@
gtk2_ardour_sources = [
'gtk_pianokeyboard.c',
'gui_object.cc',
'insert_time_dialog.cc',
'gtk_pianokeyboard.c',
'gui_object.cc',
'insert_time_dialog.cc',
+ 'instrument_selector.cc',
'interthread_progress_window.cc',
'io_selector.cc',
'hit.cc',
'interthread_progress_window.cc',
'io_selector.cc',
'hit.cc',
@@
-144,6
+144,7
@@
gtk2_ardour_sources = [
'meter_strip.cc',
'meter_patterns.cc',
'monitor_section.cc',
'meter_strip.cc',
'meter_patterns.cc',
'monitor_section.cc',
+ 'monitor_selector.cc',
'mono_panner.cc',
'mono_panner_editor.cc',
'mouse_cursors.cc',
'mono_panner.cc',
'mono_panner_editor.cc',
'mouse_cursors.cc',
@@
-199,8
+200,10
@@
gtk2_ardour_sources = [
'route_time_axis.cc',
'route_ui.cc',
'ruler_dialog.cc',
'route_time_axis.cc',
'route_ui.cc',
'ruler_dialog.cc',
+ 'save_as_dialog.cc',
'search_path_option.cc',
'selection.cc',
'search_path_option.cc',
'selection.cc',
+ 'selection_memento.cc',
'send_ui.cc',
'session_dialog.cc',
'session_import_dialog.cc',
'send_ui.cc',
'session_dialog.cc',
'session_import_dialog.cc',
@@
-228,13
+231,14
@@
gtk2_ardour_sources = [
'time_fx_dialog.cc',
'time_info_box.cc',
'time_selection.cc',
'time_fx_dialog.cc',
'time_info_box.cc',
'time_selection.cc',
+ 'timers.cc',
'track_selection.cc',
'track_view_list.cc',
'track_selection.cc',
'track_view_list.cc',
+ 'transform_dialog.cc',
'transpose_dialog.cc',
'ui_config.cc',
'utils.cc',
'verbose_cursor.cc',
'transpose_dialog.cc',
'ui_config.cc',
'utils.cc',
'verbose_cursor.cc',
- 'version.cc',
'visibility_group.cc',
'volume_controller.cc',
'window_manager.cc',
'visibility_group.cc',
'volume_controller.cc',
'window_manager.cc',
@@
-249,21
+253,30
@@
gtk2_ardour_sources = [
'video_server_dialog.cc',
'utils_videotl.cc',
'export_video_dialog.cc',
'video_server_dialog.cc',
'utils_videotl.cc',
'export_video_dialog.cc',
- 'export_video_infobox.cc'
+ 'export_video_infobox.cc',
+ 'video_tool_paths.cc'
]
]
+def enoify (major, minor):
+ if major == 3:
+ return "\\n\\\"E-No\\\""
+ elif major == 4:
+ if minor == 0:
+ return "\\n\\\"No Pussyfooting\\\""
+ elif minor == 1:
+ return "\\n\\\"Here Come the Warm Jets\\\""
+ elif minor == 2:
+ return "\\n\\\"Taking Tiger Mountain\\\""
+ elif minor == 3:
+ return "\\n\\\"Lady June's Linguistic Leprosy\\\""
+ return "\\\"\\\""
+
def options(opt):
autowaf.set_options(opt)
def configure(conf):
conf.load('misc')
conf.load('compiler_cxx')
def options(opt):
autowaf.set_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', conf.env['MAJOR'], conf.env['MINOR'], 0,
- '', '')
autowaf.configure(conf)
# TODO: Insert a sanity check for on OS X to ensure CoreAudio is present
autowaf.configure(conf)
# TODO: Insert a sanity check for on OS X to ensure CoreAudio is present
@@
-286,7
+299,8
@@
def configure(conf):
bak = conf.env['define_key']
conf.define('VERSIONSTRING', str (conf.env['VERSION']))
bak = conf.env['define_key']
conf.define('VERSIONSTRING', str (conf.env['VERSION']))
- conf.env['define_key'] = ['VERSIONSTRING']
+ conf.define('CODENAME', enoify(int(conf.env['MAJOR']), int(conf.env['MINOR'])))
+ conf.env['define_key'] = ['VERSIONSTRING', 'CODENAME' ]
conf.write_config_header('gtk2ardour-version.h')
conf.env['define_key'] = bak;
conf.write_config_header('gtk2ardour-version.h')
conf.env['define_key'] = bak;
@@
-363,16
+377,14
@@
def build_color_scheme(path, prefix):
def build(bld):
VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])
def build(bld):
VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])
+ I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
# Windows VST support w/wine
# 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')
if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
# Windows VST support w/wine
# 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/vstwin.c',
- '../vst/winmain.c',
- )
+ obj.source = ( '../libs/fst/vstwin.c', '../vst/winmain.c' )
#
# XXX do we really need to explicitly link to all of these for the wine executable?
#
#
# XXX do we really need to explicitly link to all of these for the wine executable?
#
@@
-384,11
+396,12
@@
def build(bld):
'libmidipp',
'libgtk2_ardour',
'libgtkmm2ext',
'libmidipp',
'libgtk2_ardour',
'libgtkmm2ext',
- 'libcanvas'
+ 'libcanvas'
,
]
obj.target = 'ardour-' + str (bld.env['VERSION']) + '-vst.exe.so'
obj.includes = [ '../libs/fst', '.' ]
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
]
obj.target = 'ardour-' + str (bld.env['VERSION']) + '-vst.exe.so'
obj.includes = [ '../libs/fst', '.' ]
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
+ obj.linkflags += bld.env['LDFLAGS']
obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
obj.install_path = bld.env['DLLDIR']
# end of the wine executable
obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
obj.install_path = bld.env['DLLDIR']
# end of the wine executable
@@
-430,7
+443,7
@@
def build(bld):
'PACKAGE="' + I18N_PACKAGE + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'PACKAGE="' + I18N_PACKAGE + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
- 'LOCALEDIR="' + os.path.
join(os.path.normpath(bld.env['DATADIR']), 'locale'
) + '"',
+ 'LOCALEDIR="' + os.path.
normpath(bld.env['LOCALEDIR']
) + '"',
]
obj.install_path = bld.env['DLLDIR']
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
]
obj.install_path = bld.env['DLLDIR']
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
@@
-451,8
+464,7
@@
def build(bld):
obj.includes += ['../libs']
if bld.env['build_target'] == 'mingw':
obj.includes += ['../libs']
if bld.env['build_target'] == 'mingw':
- if bld.env['DEBUG'] == False:
- obj.linkflags = ['-mwindows']
+ obj.linkflags = ['-mwindows']
if bld.is_defined('HAVE_SUIL'):
obj.source += [ 'lv2_plugin_ui.cc' ]
if bld.is_defined('HAVE_SUIL'):
obj.source += [ 'lv2_plugin_ui.cc' ]
@@
-501,7
+513,7
@@
def build(bld):
for i in dict:
setattr(obj, i, dict[i])
for i in dict:
setattr(obj, i, dict[i])
- obj = bld(features = 'subst'
, rule= 'chmod 0755 ${TGT}'
)
+ obj = bld(features = 'subst')
obj.source = 'ardev_common.sh.in'
obj.target = 'ardev_common_waf.sh'
obj.chmod = Utils.O755
obj.source = 'ardev_common.sh.in'
obj.target = 'ardev_common_waf.sh'
obj.chmod = Utils.O755
@@
-510,7
+522,7
@@
def build(bld):
obj = bld(features = 'subst')
obj.source = 'ardour.sh.in'
obj = bld(features = 'subst')
obj.source = 'ardour.sh.in'
- obj.target = 'ardour
3'
+ obj.target = 'ardour
' + str (bld.env['MAJOR'])
obj.chmod = Utils.O755
obj.dict = wrapper_subst_dict
obj.install_path = bld.env['BINDIR']
obj.chmod = Utils.O755
obj.dict = wrapper_subst_dict
obj.install_path = bld.env['BINDIR']
@@
-519,7
+531,7
@@
def build(bld):
if bld.is_defined('WINDOWS_VST_SUPPORT'):
obj = bld(features = 'subst')
obj.source = '../vst/ardourvst.in'
if bld.is_defined('WINDOWS_VST_SUPPORT'):
obj = bld(features = 'subst')
obj.source = '../vst/ardourvst.in'
- obj.target = 'ardourvst
3'
+ obj.target = 'ardourvst
' + str (bld.env['MAJOR'])
obj.chmod = Utils.O755
obj.dict = wrapper_subst_dict
obj.install_path = bld.env['BINDIR']
obj.chmod = Utils.O755
obj.dict = wrapper_subst_dict
obj.install_path = bld.env['BINDIR']
@@
-556,23
+568,25
@@
def build(bld):
# so just use it.
#
font_names = {
# so just use it.
#
font_names = {
- 'MONOSPACE' : 'Lucida Grande',
+ 'MONOSPACE' : 'Monaco',
+ 'CLOCKFONT' : 'Lucida Grande',
}
else: # Linux/X11 fonts
basefont = '' # unspecified - use system defaults
font_sizes = {
}
else: # Linux/X11 fonts
basefont = '' # unspecified - use system defaults
font_sizes = {
- 'SMALLER' : '
8
',
- 'SMALL' : '
9
',
- 'NORMAL' : '
10
',
- 'BIG' : '1
4
',
- 'BIGGER' : '1
7
',
- 'LARGE' : '1
8
',
- 'LARGER' : '
24
',
- 'HUGER' : '
34
',
- 'MASSIVE' : '
60
',
+ 'SMALLER' : '
6
',
+ 'SMALL' : '
7
',
+ 'NORMAL' : '
8
',
+ 'BIG' : '1
1
',
+ 'BIGGER' : '1
3.5
',
+ 'LARGE' : '1
4.5
',
+ 'LARGER' : '
19
',
+ 'HUGER' : '
27
',
+ 'MASSIVE' : '
48
',
}
font_names = {
'MONOSPACE' : 'ArdourMono',
}
font_names = {
'MONOSPACE' : 'ArdourMono',
+ 'CLOCKFONT' : 'ArdourMono',
}
# Set up font substitution dictionary
}
# Set up font substitution dictionary
@@
-627,7
+641,7
@@
def build(bld):
obj.command_is_external = True
obj.no_inputs = True
obj.argv = menus_argv
obj.command_is_external = True
obj.no_inputs = True
obj.argv = menus_argv
- obj.dep_vars = ['GTKOSX']
+ obj.dep_vars = ['GTKOSX'
, 'WINDOWS'
]
obj.stdin = program + '.menus.in'
obj.stdout = program + '.menus'
bld.install_files (bld.env['CONFDIR'], program + '.menus')
obj.stdin = program + '.menus.in'
obj.stdout = program + '.menus'
bld.install_files (bld.env['CONFDIR'], program + '.menus')
@@
-667,29
+681,32
@@
def build(bld):
bld.install_files(bld.env['CONFDIR'], 'dark.colors')
# Default export stuff
bld.install_files(bld.env['CONFDIR'], 'dark.colors')
# Default export stuff
- bld.install_files(os.path.join(bld.env['CONFDIR'],
'
export'), bld.path.ant_glob('export/*.format'))
+ bld.install_files(os.path.join(bld.env['CONFDIR'],
'
export'), bld.path.ant_glob('export/*.format'))
# i18n
if bld.is_defined('ENABLE_NLS'):
mo_files = bld.path.ant_glob('po/*.mo')
for mo in mo_files:
lang = os.path.basename(mo.srcpath()).replace('.mo', '')
# i18n
if bld.is_defined('ENABLE_NLS'):
mo_files = bld.path.ant_glob('po/*.mo')
for mo in mo_files:
lang = os.path.basename(mo.srcpath()).replace('.mo', '')
- bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
- lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
- mo)
+ bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
+ mo)
def i18n(bld):
def i18n(bld):
- autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
- 'Paul Davis')
-
+ I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
+ autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+ 'Paul Davis')
+
def i18n_pot(bld):
def i18n_pot(bld):
- autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
- 'Paul Davis')
+ I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
+ autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+ 'Paul Davis')
def i18n_po(bld):
def i18n_po(bld):
- autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
- 'Paul Davis')
-
+ I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
+ autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+ 'Paul Davis')
+
def i18n_mo(bld):
def i18n_mo(bld):
- autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
- 'Paul Davis')
+ I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
+ autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
+ 'Paul Davis')