rename system and user config files with product-neutral names

diff --git a/ardour_system.rc b/ardour_system.rc
deleted file mode 100644 (file)
index 5603209..0000000
--- a/ardour_system.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Ardour>
-  <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"/>
-    <Option name="mute-affects-pre-fader" value="1"/>
-    <Option name="mute-affects-post-fader" value="1"/>
-    <Option name="mute-affects-control-outs" value="1"/>
-    <Option name="mute-affects-main-outs" value="1"/>
-    <Option name="monitoring-model" value="ExternalMonitoring"/>
-    <Option name="solo-latch" value="1"/>
-    <Option name="mtc-port" value="mtc"/>
-    <Option name="mmc-port" value="mmc"/>
-    <Option name="midi-port" value="control"/>
-    <Option name="jack-time-master" value="1"/>
-    <Option name="trace-midi-input" value="0"/>
-    <Option name="trace-midi-output" value="0"/>
-    <Option name="plugins-stop-with-transport" value="0"/>
-    <Option name="no-sw-monitoring" value="0"/>
-    <Option name="stop-recording-on-xrun" value="0"/>
-    <Option name="create-xrun-marker" value="1"/>
-    <Option name="stop-at-session-end" value="0"/>
-    <Option name="auto-xfade" value="1"/>
-    <Option name="crossfades-active" value="1"/>
-    <Option name="crossfades-visible" value="1"/>
-    <Option name="xfade-model" value="FullCrossfade"/>
-    <Option name="no-new-session-dialog" value="1"/>
-    <Option name="timecode-source-is-synced" value="1"/>
-    <Option name="auditioner-left-out" value="default"/>
-    <Option name="auditioner-right-out" value="default"/>
-    <Option name="quieten-at-speed" value="1.000000"/>
-    <Option name="use-vst" value="1"/>
-    <Option name="use-tranzport" value="1"/>
-    <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="timecode-format" value="timecode_30"/>
-    <Option name="font-scale" value="81920"/>
-    <Option name="seamless-loop" value="1"/>
-  </Config>
-  <extra>
-    <Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>
-  </extra>
-</Ardour>
-

diff --git a/ardour_system_sae.rc b/ardour_system_sae.rc
deleted file mode 100644 (file)
index c11a01c..0000000
--- a/ardour_system_sae.rc
+++ /dev/null
@@ -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>
-

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index b0be237563b4bb97c6184838cde61750da3c6bd0..d1e80e75ef2602bc7115a0578435a81ca395fe5b 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -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()) {

diff --git a/system_config b/system_config
new file mode 100644 (file)
index 0000000..5603209
--- /dev/null
+++ b/system_config
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Ardour>
+  <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"/>
+    <Option name="mute-affects-pre-fader" value="1"/>
+    <Option name="mute-affects-post-fader" value="1"/>
+    <Option name="mute-affects-control-outs" value="1"/>
+    <Option name="mute-affects-main-outs" value="1"/>
+    <Option name="monitoring-model" value="ExternalMonitoring"/>
+    <Option name="solo-latch" value="1"/>
+    <Option name="mtc-port" value="mtc"/>
+    <Option name="mmc-port" value="mmc"/>
+    <Option name="midi-port" value="control"/>
+    <Option name="jack-time-master" value="1"/>
+    <Option name="trace-midi-input" value="0"/>
+    <Option name="trace-midi-output" value="0"/>
+    <Option name="plugins-stop-with-transport" value="0"/>
+    <Option name="no-sw-monitoring" value="0"/>
+    <Option name="stop-recording-on-xrun" value="0"/>
+    <Option name="create-xrun-marker" value="1"/>
+    <Option name="stop-at-session-end" value="0"/>
+    <Option name="auto-xfade" value="1"/>
+    <Option name="crossfades-active" value="1"/>
+    <Option name="crossfades-visible" value="1"/>
+    <Option name="xfade-model" value="FullCrossfade"/>
+    <Option name="no-new-session-dialog" value="1"/>
+    <Option name="timecode-source-is-synced" value="1"/>
+    <Option name="auditioner-left-out" value="default"/>
+    <Option name="auditioner-right-out" value="default"/>
+    <Option name="quieten-at-speed" value="1.000000"/>
+    <Option name="use-vst" value="1"/>
+    <Option name="use-tranzport" value="1"/>
+    <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="timecode-format" value="timecode_30"/>
+    <Option name="font-scale" value="81920"/>
+    <Option name="seamless-loop" value="1"/>
+  </Config>
+  <extra>
+    <Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>
+  </extra>
+</Ardour>
+

diff --git a/wscript b/wscript
index 47157aa1983264c58ad2cab45a2ffe26a40a8453..4f1b56dc541b58a720d2d6756a842d3169100723 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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)