summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SConstruct2
-rw-r--r--ardour.rc.in22
-rw-r--r--gtk2_ardour/midi_region_view.cc2
-rw-r--r--gtk2_ardour/wscript11
-rw-r--r--libs/ardour/ardour/rc_configuration_vars.h8
-rw-r--r--libs/ardour/globals.cc8
-rw-r--r--libs/surfaces/frontier/wscript2
-rw-r--r--libs/surfaces/generic_midi/wscript2
-rw-r--r--libs/surfaces/mackie/wscript2
-rw-r--r--libs/surfaces/osc/wscript2
-rw-r--r--libs/surfaces/powermate/wscript2
-rw-r--r--libs/surfaces/tranzport/wscript2
-rw-r--r--libs/surfaces/wiimote/wscript2
-rw-r--r--wscript12
14 files changed, 45 insertions, 34 deletions
diff --git a/SConstruct b/SConstruct
index 12bc5af4b5..31659005ec 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1065,7 +1065,7 @@ elif conf.CheckCHeader('alsa/asoundlib.h'):
libraries['sysmidi'] = LibraryInfo ()
libraries['sysmidi'].ParseConfig('pkg-config --cflags --libs alsa')
env['SYSMIDI'] = 'ALSA Sequencer'
- subst_dict['%MIDITAG%'] = "seq"
+ subst_dict['%MIDITAG%'] = "control"
subst_dict['%MIDITYPE%'] = "alsa/sequencer"
print "Using ALSA MIDI"
elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
diff --git a/ardour.rc.in b/ardour.rc.in
index 90da0fd640..fa9c1fbafc 100644
--- a/ardour.rc.in
+++ b/ardour.rc.in
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Ardour>
- <MIDI-port tag="%MIDITAG%" device="ardour" type="%MIDITYPE%" mode="duplex"/>
- <MIDI-port tag="control" device="ardour" type="%MIDITYPE%" mode="duplex"/>
- <MIDI-port tag="mcu" device="ardour" type="%MIDITYPE%" mode="duplex"/>
+ <MIDI-port tag="@MIDITAG@" device="ardour" type="@MIDITYPE@" mode="duplex"/>
<Config>
<Option name="minimum-disk-io-bytes" value="262144"/>
<Option name="track-buffer-seconds" value="5.000000"/>
@@ -10,18 +8,18 @@
<Option name="mute-affects-post-fader" value="yes"/>
<Option name="mute-affects-control-outs" value="yes"/>
<Option name="mute-affects-main-outs" value="yes"/>
- <Option name="monitoring-model" value="2"/>
+ <Option name="monitoring-model" value="2"/>
<Option name="solo-latch" value="yes"/>
- <Option name="mtc-port" value="%MIDITAG%"/>
- <Option name="mmc-port" value="%MIDITAG%"/>
- <Option name="midi-port" value="%MIDITAG%"/>
+ <Option name="mtc-port" value="@MIDITAG@"/>
+ <Option name="mmc-port" value="@MIDITAG@"/>
+ <Option name="midi-port" value="@MIDITAG@"/>
<Option name="jack-time-master" value="yes"/>
<Option name="trace-midi-input" value="no"/>
<Option name="trace-midi-output" value="no"/>
<Option name="plugins-stop-with-transport" value="no"/>
<Option name="no-sw-monitoring" value="no"/>
<Option name="stop-recording-on-xrun" value="no"/>
- <Option name="create-xrun-marker" value="yes"/>
+ <Option name="create-xrun-marker" value="yes"/>
<Option name="stop-at-session-end" value="no"/>
<Option name="auto-xfade" value="yes"/>
<Option name="crossfades-active" value="1"/>
@@ -29,8 +27,8 @@
<Option name="xfade-model" value="0"/>
<Option name="no-new-session-dialog" value="yes"/>
<Option name="timecode-source-is-synced" value="yes"/>
- <Option name="auditioner-left-out" value="%JACK_INPUT%1"/>
- <Option name="auditioner-right-out" value="%JACK_INPUT%2"/>
+ <Option name="auditioner-left-out" value="@JACK_INPUT@1"/>
+ <Option name="auditioner-right-out" value="@JACK_INPUT@2"/>
<Option name="quieten-at-speed" value="1.000000"/>
<Option name="use-vst" value="yes"/>
<Option name="use-tranzport" value="yes"/>
@@ -39,9 +37,9 @@
<Option name="periodic-safety-backups" value="1"/>
<Option name="periodic-safety-backup-interval" value="120"/>
<Option name="show-track-meters" value="1"/>
- <Option name="default-narrow_ms" value="0"/>
+ <Option name="default-narrow_ms" value="0"/>
<Option name="smpte-format" value="6"/>
- <Option name="font-scale" value="102400"/>
+ <Option name="font-scale" value="102400"/>
</Config>
<extra>
<Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 40f267717b..ad6e74c0cf 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -2521,5 +2521,3 @@ MidiRegionView::selection_as_notelist (Notes& selected)
}
}
}
-
-
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index bf53167f5e..40c7fd48be 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -246,11 +246,11 @@ def build(bld):
obj.cflags = ['-DPACKAGE="gtk2_ardour"']
obj.cxxflags = ['-DPACKAGE="gtk2_ardour"']
obj.cxxflags += ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"']
- obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIRNAME']) + '"']
- obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '"']
- obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIRNAME']) + '"']
+ obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
+ obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
+ obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
obj.cxxflags += ['-DLOCALEDIR="' + os.path.join(
- os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
+ os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
if bld.env['HAVE_SLV2']:
obj.source += [ 'lv2_plugin_ui.cc' ]
@@ -401,6 +401,9 @@ def build(bld):
bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm')
bld.install_files('${DATADIR}/ardour3', 'splash.png')
+ # Default UI configuration
+ bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
+
# i18n
if bld.env['ENABLE_NLS']:
mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 237ff1d3d3..5b0be5cccf 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -25,10 +25,10 @@ CONFIG_VARIABLE (AutoConnectOption, input_auto_connect, "input-auto-connect", Au
/* MIDI and MIDI related */
-CONFIG_VARIABLE (std::string, mtc_port_name, "mtc-port-name", "default")
-CONFIG_VARIABLE (std::string, mmc_port_name, "mmc-port-name", "default")
-CONFIG_VARIABLE (std::string, midi_port_name, "midi-port-name", "default")
-CONFIG_VARIABLE (std::string, midi_clock_port_name, "midi-clock-port-name", "default")
+CONFIG_VARIABLE (std::string, mtc_port_name, "mtc-port-name", "control")
+CONFIG_VARIABLE (std::string, mmc_port_name, "mmc-port-name", "control")
+CONFIG_VARIABLE (std::string, midi_port_name, "midi-port-name", "control")
+CONFIG_VARIABLE (std::string, midi_clock_port_name, "midi-clock-port-name", "control")
CONFIG_VARIABLE (bool, trace_midi_input, "trace-midi-input", false)
CONFIG_VARIABLE (bool, trace_midi_output, "trace-midi-output", false)
CONFIG_VARIABLE (bool, send_mtc, "send-mtc", false)
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index d893c1e54b..e7fd81349f 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -131,19 +131,19 @@ ARDOUR::setup_midi ()
/* More than one port, so try using specific names for each port */
- if (Config->get_mmc_port_name() != N_("default")) {
+ if (Config->get_mmc_port_name() != N_("control")) {
default_mmc_port = MIDI::Manager::instance()->port (Config->get_mmc_port_name());
}
- if (Config->get_mtc_port_name() != N_("default")) {
+ if (Config->get_mtc_port_name() != N_("control")) {
default_mtc_port = MIDI::Manager::instance()->port (Config->get_mtc_port_name());
}
- if (Config->get_midi_port_name() != N_("default")) {
+ if (Config->get_midi_port_name() != N_("control")) {
default_midi_port = MIDI::Manager::instance()->port (Config->get_midi_port_name());
}
- if (Config->get_midi_clock_port_name() != N_("default")) {
+ if (Config->get_midi_clock_port_name() != N_("control")) {
default_midi_port = MIDI::Manager::instance()->port (Config->get_midi_clock_port_name());
}
diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 702237d695..652dafe825 100644
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -40,7 +40,7 @@ def build(bld):
obj.target = 'generic_midi'
obj.uselib_local = 'libardour libsurfaces'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index c26643e656..37975fb434 100644
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -32,7 +32,7 @@ def build(bld):
obj.target = 'ardour_generic_midi'
obj.uselib_local = 'libardour libardour_cp'
obj.vnum = LIBARDOUR_GENERIC_MIDI_LIB_VERSION
- obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index e55c01217a..4ef5995dc2 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -47,7 +47,7 @@ def build(bld):
obj.target = 'ardour_mcp'
obj.uselib_local = 'libardour libardour_cp'
obj.vnum = LIBARDOUR_MCP_LIB_VERSION
- obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index b365638670..298b358a55 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -34,7 +34,7 @@ def build(bld):
obj.uselib = ' LO '
obj.uselib_local = 'libardour libardour_cp'
obj.vnum = LIBARDOUR_OSC_LIB_VERSION
- obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript
index f8dd55c515..1aea8b652b 100644
--- a/libs/surfaces/powermate/wscript
+++ b/libs/surfaces/powermate/wscript
@@ -31,7 +31,7 @@ def build(bld):
obj.target = 'powermate'
obj.uselib_local = 'libardour libardour_cp'
obj.vnum = LIBARDOUR_POWERMATE_LIB_VERSION
- obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index a5181566c2..172f51d37e 100644
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -45,7 +45,7 @@ def build(bld):
obj.target = 'ardour_tranzport'
obj.uselib_local = 'libardour libardour_cp'
obj.vnum = LIBARDOUR_TRANZPORT_LIB_VERSION
- obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index 112f06e5d4..edfb3ad901 100644
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -31,7 +31,7 @@ def build(bld):
obj.target = 'wiimote'
obj.uselib_local = 'libardour libardour_cp'
obj.vnum = LIBARDOUR_WIIMOTE_LIB_VERSION
- obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
def shutdown():
autowaf.shutdown()
diff --git a/wscript b/wscript
index 044ece74a1..14a5ac2352 100644
--- a/wscript
+++ b/wscript
@@ -434,6 +434,18 @@ def build(bld):
bld.add_subdirs('libs/appleutility')
for i in children:
bld.add_subdirs(i)
+
+ rc_subst_dict = {
+ 'MIDITAG' : 'control',
+ 'MIDITYPE' : 'jack',
+ 'JACK_INPUT' : 'auditioner'
+ }
+
+ obj = bld.new_task_gen('subst')
+ obj.source = 'ardour.rc.in'
+ obj.target = 'ardour_system.rc'
+ obj.dict = rc_subst_dict
+ obj.install_path = '${CONFIGDIR}/ardour3'
def i18n(bld):
bld.recurse (i18n_children)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 18:08:57 +0000