clean up stupid confusion over ardour_system.rc and its contents. this file does not require substitution anymore, and besides, it was being subst'ed incorrectly because of changes to waf that were addressed in gtk2_ardour/wscript but not the top level wscript
git-svn-id: svn://localhost/ardour2/branches/3.0@13408 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
684121c951
commit
aad35ec182
@ -10,9 +10,9 @@
|
|||||||
<Option name="mute-affects-main-outs" value="1"/>
|
<Option name="mute-affects-main-outs" value="1"/>
|
||||||
<Option name="monitoring-model" value="ExternalMonitoring"/>
|
<Option name="monitoring-model" value="ExternalMonitoring"/>
|
||||||
<Option name="solo-latch" value="1"/>
|
<Option name="solo-latch" value="1"/>
|
||||||
<Option name="mtc-port" value="@MIDITAG@"/>
|
<Option name="mtc-port" value="mtc"/>
|
||||||
<Option name="mmc-port" value="@MIDITAG@"/>
|
<Option name="mmc-port" value="mmc"/>
|
||||||
<Option name="midi-port" value="@MIDITAG@"/>
|
<Option name="midi-port" value="control"/>
|
||||||
<Option name="jack-time-master" value="1"/>
|
<Option name="jack-time-master" value="1"/>
|
||||||
<Option name="trace-midi-input" value="0"/>
|
<Option name="trace-midi-input" value="0"/>
|
||||||
<Option name="trace-midi-output" value="0"/>
|
<Option name="trace-midi-output" value="0"/>
|
||||||
@ -27,8 +27,8 @@
|
|||||||
<Option name="xfade-model" value="FullCrossfade"/>
|
<Option name="xfade-model" value="FullCrossfade"/>
|
||||||
<Option name="no-new-session-dialog" value="1"/>
|
<Option name="no-new-session-dialog" value="1"/>
|
||||||
<Option name="timecode-source-is-synced" value="1"/>
|
<Option name="timecode-source-is-synced" value="1"/>
|
||||||
<Option name="auditioner-left-out" value="@JACK_INPUT@1"/>
|
<Option name="auditioner-left-out" value="default"/>
|
||||||
<Option name="auditioner-right-out" value="@JACK_INPUT@2"/>
|
<Option name="auditioner-right-out" value="default"/>
|
||||||
<Option name="quieten-at-speed" value="1.000000"/>
|
<Option name="quieten-at-speed" value="1.000000"/>
|
||||||
<Option name="use-vst" value="1"/>
|
<Option name="use-vst" value="1"/>
|
||||||
<Option name="use-tranzport" value="1"/>
|
<Option name="use-tranzport" value="1"/>
|
23
wscript
23
wscript
@ -729,28 +729,7 @@ def build(bld):
|
|||||||
for i in children:
|
for i in children:
|
||||||
bld.recurse(i)
|
bld.recurse(i)
|
||||||
|
|
||||||
# ideally, we'd like to use the OS-provided MIDI API
|
bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc')
|
||||||
# for default ports. that doesn't work on at least
|
|
||||||
# Fedora (Nov 9th, 2009) so use JACK MIDI on linux.
|
|
||||||
|
|
||||||
if sys.platform == 'darwin':
|
|
||||||
rc_subst_dict = {
|
|
||||||
'MIDITAG' : 'control',
|
|
||||||
'MIDITYPE' : 'coremidi',
|
|
||||||
'JACK_INPUT' : 'auditioner'
|
|
||||||
}
|
|
||||||
else:
|
|
||||||
rc_subst_dict = {
|
|
||||||
'MIDITAG' : 'control',
|
|
||||||
'MIDITYPE' : 'jack',
|
|
||||||
'JACK_INPUT' : 'auditioner'
|
|
||||||
}
|
|
||||||
|
|
||||||
obj = bld(features = 'subst')
|
|
||||||
obj.source = 'ardour.rc.in'
|
|
||||||
obj.target = 'ardour_system.rc'
|
|
||||||
obj.dict = rc_subst_dict
|
|
||||||
obj.install_path = '${SYSCONFDIR}/ardour3'
|
|
||||||
|
|
||||||
def i18n(bld):
|
def i18n(bld):
|
||||||
bld.recurse (i18n_children)
|
bld.recurse (i18n_children)
|
||||||
|
Loading…
Reference in New Issue
Block a user