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

rename system and user config files with product-neutral names

Browse Source
This commit is contained in:
Paul Davis 2014-09-04 12:31:30 -04:00
parent 94adde7ebb
commit 9ad3feaba0
4 changed files with 7 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ardour_system_sae.rc
View File

@ -1,71 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Ardour>
<MIDI-port tag="ardour" device="ardour" type="coremidi" mode="duplex"/>
<MIDI-port tag="mcu" device="ardour" type="coremidi" mode="duplex"/>
<Config>
<Option name="minimum-disk-io-bytes" value="262144"/>
<Option name="track-buffer-seconds" value="5.000000"/>
<Option name="mute-affects-pre-fader" value="yes"/>
<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="solo-latch" value="yes"/>
<Option name="mtc-port" value="ardour"/>
<Option name="mmc-port" value="ardour"/>
<Option name="midi-port" value="ardour"/>
<Option name="use-mmc" value="yes"/>
<Option name="send-mmc" value="yes"/>
<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="stop-at-session-end" value="no"/>
<Option name="auto-xfade" value="yes"/>
<Option name="crossfades-active" value="1"/>
<Option name="crossfades-visible" value="1"/>
<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="coreaudio:Built-in Audio:in1"/>
<Option name="auditioner-right-out" value="coreaudio:Built-in Audio:in2"/>
<Option name="quieten-at-speed" value="1.000000"/>
<Option name="use-vst" value="yes"/>
<Option name="use-tranzport" value="yes"/>
<Option name="disk-choice-space-threshold" value="57600000"/>
<Option name="destructive-xfade-msecs" value="20"/>
<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="smpte-format" value="6"/>
<Option name="font-scale" value="102400"/>
<Option name="auto-return" value="1"/>
<Option name="solo-latched" value="0"/>
<Option name="link-region-and-track-selection" value="1"/>
<Option name="send-mtc" value="1"/>
<Option name="tape-machine-mode" value="1"/>
<Option name="monitoring-model" value="1"/>
</Config>
<extra>
<RulerVisibility smpte="yes" bbt="yes" frames="no" minsec="no" tempo="yes" meter="yes" marker="yes" rangemarker="no" transportmarker="yes" cdmarker="no"/>
<Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>
<AudioSetup>
<periods val="2"/>
<priority val="60"/>
<ports val="256"/>
<realtime val="1"/>
<samplerate val="44100Hz"/>
<periodsize val="256"/>
<driver val="CoreAudio"/>
<interface val="Aggregate Device"/>
<inputdevice val="Aggregate Device"/>
<outputdevice val="Aggregate Device"/>
</AudioSetup>
</extra>
</Ardour>

9
libs/ardour/rc_configuration.cc
View File

@ -49,6 +49,9 @@ namespace ARDOUR {
float speed_quietning = 0.251189; // -12dB reduction for ffwd or rewind
}
static const char* user_config_file_name = "config";
static const char* system_config_file_name = "system_config";
RCConfiguration::RCConfiguration ()
:
/* construct variables */
@ -76,7 +79,7 @@ RCConfiguration::load_state ()
/* load system configuration first */
if (find_file (ardour_config_search_path(), "ardour_system.rc", rcfile)) {
if (find_file (ardour_config_search_path(), system_config_file_name, rcfile)) {
/* stupid XML Parser hates empty files */
@ -104,7 +107,7 @@ RCConfiguration::load_state ()
/* now load configuration file for user */
if (find_file (ardour_config_search_path(), "ardour.rc", rcfile)) {
if (find_file (ardour_config_search_path(), user_config_file_name, rcfile)) {
/* stupid XML parser hates empty files */
@ -136,7 +139,7 @@ RCConfiguration::load_state ()
int
RCConfiguration::save_state()
{
const std::string rcfile = Glib::build_filename (user_config_directory(), "ardour.rc");
const std::string rcfile = Glib::build_filename (user_config_directory(), user_config_file_name);
// this test seems bogus?
if (!rcfile.empty()) {

0
ardour_system.rc → system_config
View File

2
wscript
View File

@ -875,7 +875,7 @@ def build(bld):
for i in children:
bld.recurse(i)
bld.install_files (bld.env['CONFDIR'], 'ardour_system.rc')
bld.install_files (bld.env['CONFDIR'], 'system_config')
if bld.env['RUN_TESTS']:
bld.add_post_fun(test)