diff options
| -rw-r--r-- | ardour_system_sae.rc | 24 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/main.cc | 4 | ||||
| -rw-r--r-- | instant.xml | 7 | ||||
| -rw-r--r-- | instant.xml.sae | 7 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 4 |
7 files changed, 56 insertions, 3 deletions
diff --git a/ardour_system_sae.rc b/ardour_system_sae.rc index 551ee61fca..45755aa243 100644 --- a/ardour_system_sae.rc +++ b/ardour_system_sae.rc @@ -39,13 +39,33 @@ <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"/> + <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="128"/> + <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/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index df7ca68f25..1af90e1232 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2885,6 +2885,12 @@ ARDOUR_UI::editor_settings () const } else { node = Config->instant_xml(X_("Editor"), get_user_ardour_path()); } + + if (!node) { + if (getenv("ARDOUR_INSTANT_XML_PATH")) { + node = Config->instant_xml(X_("Editor"), getenv("ARDOUR_INSTANT_XML_PATH")); + } + } if (!node) { node = new XMLNode (X_("Editor")); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 25fdd1f7f4..cec5dbbda5 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1227,7 +1227,12 @@ Editor::connect_to_session (Session *t) zoom_range_clock.set_session (session); _playlist_selector->set_session (session); nudge_clock.set_session (session); - nudge_clock.set (session->frame_rate() * 5); // default of 5 seconds + if (Profile->get_sae()) { + nudge_clock.set_mode(AudioClock::BBT); + nudge_clock.set (session->frame_rate() / 32, true, 0, AudioClock::BBT); + } else { + nudge_clock.set (session->frame_rate() * 5, true, 0, AudioClock::SMPTE); // default of 5 seconds + } playhead_cursor->canvas_item.show (); diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 468ad21bd0..1c1589695a 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -117,6 +117,10 @@ fixup_bundle_environment () setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1); setenv ("ARDOUR_DATA_PATH", path.c_str(), 1); + path = dir_path; + path += "/../Resources"; + setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1); + cstr = getenv ("LADSPA_PATH"); if (cstr) { path = cstr; diff --git a/instant.xml b/instant.xml new file mode 100644 index 0000000000..1cf5ce7c59 --- /dev/null +++ b/instant.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<instant> + <Editor id="12" mixer-width="Wide" zoom-focus="3" zoom="2048.000000" snap-to="12" snap-mode="1" edit-point="EditAtPlayhead" playhead="0" show-waveforms="yes" show-waveforms-recording="yes" show-measures="yes" follow-playhead="yes" xfades-visible="yes" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" show-editor-mixer="yes"> + <geometry x_size="995" y_size="765" x_pos="1" y_pos="22" x_off="1" y_off="44" edit_pane_pos="823"/> + </Editor> + <Mixer narrow-strips="no" show-mixer="no"/> +</instant> diff --git a/instant.xml.sae b/instant.xml.sae new file mode 100644 index 0000000000..1cf5ce7c59 --- /dev/null +++ b/instant.xml.sae @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<instant> + <Editor id="12" mixer-width="Wide" zoom-focus="3" zoom="2048.000000" snap-to="12" snap-mode="1" edit-point="EditAtPlayhead" playhead="0" show-waveforms="yes" show-waveforms-recording="yes" show-measures="yes" follow-playhead="yes" xfades-visible="yes" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" show-editor-mixer="yes"> + <geometry x_size="995" y_size="765" x_pos="1" y_pos="22" x_off="1" y_off="44" edit_pane_pos="823"/> + </Editor> + <Mixer narrow-strips="no" show-mixer="no"/> +</instant> diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index f1d2f43309..978d1ed9f8 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -209,9 +209,13 @@ cp ../../gtk2_ardour/ardour-sae.menus $Resources if test x$SAE != x ; then cp ../../ardour_system_sae.rc $Resources/ardour_system.rc echo cp ../../ardour_system_sae.rc $Resources/ardour_system.rc + cp ../../instant.xml.sae $Resources/instant.xml + echo cp ../../instant.xml.sae $Resources/instant.xml else cp ../../ardour_system.rc $Resources/ardour_system.rc echo FOO cp ../../ardour_system.rc $Resources/ardour_system.rc + cp ../../instant.xml $Resources/instant.xml + echo cp ../../instant.xml $Resources/instant.xml fi cp ../../gtk2_ardour/ardour2_ui_sae.conf $Resources cp ../../gtk2_ardour/ardour2_ui_default.conf $Resources |