ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix various MIDI control and installation issues:

Browse Source 
* Install ardour3_ui_default.conf to system config dir

 * Set -DDATA_DIR etc. defines to proper absolute paths

 * Set default MIDI control port name to "control"
   (it was "control" some places, "default" other, so the generic MIDI
   control surface didn't work.  The real problem here is probably that
   the name is hardcoded in the surface code, ick)

 * Install surfaces to correct system directory

 * Generate and install ardour_system.rc

User POV:

 * Installed versions not run from the source directory discover configuration
   files and surfaces, and generally work

 * Building and/or starting a fresh copy of ardour3 with no pre-existing
   configuration will run an ardour with a single MIDI "control" port, which
   you can plug a surface into and control MMC and controllers and such
   (after turning on the generic MIDI surface, which IMO should be loaded
    by default anyway, especially since it's no longer in a menu)


git-svn-id: svn://localhost/ardour2/branches/3.0@5833 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-20 23:43:19 +00:00
parent 0849685f85
commit 214a31bb98
14 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -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'):

22
ardour.rc.in
View File

@ -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"/>

2
gtk2_ardour/midi_region_view.cc
View File

@ -2521,5 +2521,3 @@ MidiRegionView::selection_as_notelist (Notes& selected)
}
}
}

11
gtk2_ardour/wscript
View File

@ -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'))

8
libs/ardour/ardour/rc_configuration_vars.h
View File

@ -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)

8
libs/ardour/globals.cc
View File

@ -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());
}

2
libs/surfaces/frontier/wscript
View File

@ -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()

2
libs/surfaces/generic_midi/wscript
View File

@ -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()

2
libs/surfaces/mackie/wscript
View File

@ -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()

2
libs/surfaces/osc/wscript
View File

@ -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()

2
libs/surfaces/powermate/wscript
View File

@ -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()

2
libs/surfaces/tranzport/wscript
View File

@ -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()

2
libs/surfaces/wiimote/wscript
View File

@ -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()

12
wscript
View File

@ -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)