Commit 1d3a8804 authored by nixopper's avatar nixopper
Browse files

Merge branch 'master' of laptop:/home/user/media/ardour

parents dc63799e 856f894c
<?xml version="1.0" encoding="UTF-8"?>
<instant>
<Main x="0" y="31" w="1280" h="740" current-tab="editor"/>
<Editor id="41" edit-horizontal-pane-pos="0.89999997615814209" notebook-shrunk="0" edit-vertical-pane-pos="0.89999997615814209" mixer-width="Wide" zoom-focus="ZoomFocusPlayhead" zoom="3564" snap-to="SnapToBeat" snap-mode="SnapOff" internal-snap-to="SnapToBeat" internal-snap-mode="SnapOff" pre-internal-snap-to="SnapToBeat" pre-internal-snap-mode="SnapOff" edit-point="EditAtMouse" visible-track-count="-1" playhead="542546154" left-frame="541097846" y-origin="0" show-measures="1" maximised="0" follow-playhead="1" stationary-playhead="0" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" join-object-range="0" show-editor-mixer="0" show-editor-list="0" editor-list-page="0" show-marker-lines="0" nudge-clock-value="220500">
<Main x="0" y="31" w="1280" h="740" current-tab="preferences"/>
<Editor id="41" edit-horizontal-pane-pos="0.89999997615814209" notebook-shrunk="0" edit-vertical-pane-pos="0.89999997615814209" mixer-width="Wide" zoom-focus="ZoomFocusPlayhead" zoom="2048" snap-to="SnapToBeat" snap-mode="SnapOff" internal-snap-to="SnapToBeat" internal-snap-mode="SnapOff" pre-internal-snap-to="SnapToBeat" pre-internal-snap-mode="SnapOff" edit-point="EditAtMouse" visible-track-count="-1" playhead="0" left-frame="0" y-origin="0" show-measures="1" maximised="0" follow-playhead="1" stationary-playhead="0" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" join-object-range="0" show-editor-mixer="0" show-editor-list="0" editor-list-page="0" show-marker-lines="0" nudge-clock-value="220500">
<Window name="Editor" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" tabbed="1"/>
<Buttons>
<Press/>
......@@ -15,11 +15,9 @@
<ActionHooks/>
<EditorLocations clock-mode="BBT"/>
</Editor>
<Mixer mixer-rhs-pane1-pos="0.60000002384185791" mixer-rhs_pane2-pos="0.69999998807907104" mixer-list-hpane-pos="0.0625" mixer-inner-pane-pos="0.80000001192092896" narrow-strips="0" show-mixer="1" show-mixer-list="1" maximised="0" monitor-section-visible="0">
<Window name="Mixer" visible="1" x-off="128" y-off="89" x-size="1018" y-size="655" tabbed="0"/>
<PluginOrder>
<PluginInfo sort="0" unique-id="http://plugin.org.uk/swh-plugins/fastLookaheadLimiter" expanded="0"/>
</PluginOrder>
<Mixer mixer-rhs-pane1-pos="0.60000002384185791" mixer-rhs_pane2-pos="0.69999998807907104" mixer-list-hpane-pos="0.0625" mixer-inner-pane-pos="0.80000001192092896" narrow-strips="0" show-mixer="0" show-mixer-list="1" maximised="0" monitor-section-visible="0">
<Window name="Mixer" visible="0" x-off="0" y-off="81" x-size="1018" y-size="655" tabbed="0"/>
<PluginOrder/>
</Mixer>
<Preferences>
<Window name="Preferences" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" tabbed="1"/>
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<Session version="3002" name="stage-mixer" sample-rate="48000" end-is-free="1" id-counter="5044" name-counter="1" event-counter="52" vca-counter="1">
<Session version="3002" name="stage-mixer" sample-rate="48000" end-is-free="1" id-counter="1827" name-counter="1" event-counter="10" vca-counter="1">
<ProgramVersion created-with="Ardour 5.12-ae0dcdc0" modified-with="Ardour 5.12-ae0dcdc0"/>
<MIDIPorts>
<Port name="MIDI Clock in" direction="input"/>
......@@ -620,7 +620,7 @@
<Controllable name="rec-enable" id="331" flags="Toggle,RealTime" value="0"/>
<Diskstream flags="Recordable" playlist="mics.1" name="mics" id="336" speed="1" capture-alignment="Automatic" record-safe="0" channels="2"/>
</Route>
<Route id="1025" name="moc" default-type="audio" strict-io="1" active="1" denormal-protection="0" meter-point="MeterInput" meter-type="MeterPeak0dB">
<Route id="1025" name="moc" default-type="audio" strict-io="1" active="1" denormal-protection="0" meter-point="MeterInput" meter-type="MeterPeak">
<PresentationInfo order="3" flags="AudioBus,OrderSet" color="4222009087"/>
<Controllable name="solo" id="1033" flags="Toggle,RealTime" value="0" self-solo="0" soloed-by-upstream="0" soloed-by-downstream="0"/>
<Controllable name="solo-iso" id="1039" flags="Toggle,RealTime" value="0" solo-isolated="0"/>
......@@ -641,8 +641,8 @@
<Connection other="Master/audio_in 2"/>
</Port>
</IO>
<MuteMaster mute-point="PostFader,Listen,Main" muted="0"/>
<Controllable name="mute" id="1035" flags="Toggle,RealTime" value="0"/>
<MuteMaster mute-point="PostFader,Listen,Main" muted="1"/>
<Controllable name="mute" id="1035" flags="Toggle,RealTime" value="1"/>
<Controllable name="phase" id="1037" flags="Toggle" value="0" phase-invert="00"/>
<Automation>
<AutomationList automation-id="solo" id="1032" interpolation-style="Discrete" state="Off"/>
......@@ -681,7 +681,7 @@
<Automation>
<AutomationList automation-id="gain" id="1028" interpolation-style="Linear" state="Off"/>
</Automation>
<Controllable name="gaincontrol" id="1029" flags="GainLike" value="0.9985467791557312"/>
<Controllable name="gaincontrol" id="1029" flags="GainLike" value="2"/>
</Processor>
<Processor id="1058" name="moc" active="1" user-latency="0" own-input="1" own-output="0" output="moc" type="main-outs" role="Main">
<PannerShell bypassed="0" user-panner="" linked-to-route="1"/>
......@@ -815,14 +815,14 @@
</Processor>
</Click>
<LTC-In>
<IO name="LTC In" id="47" direction="Input" default-type="audio" user-latency="0">
<IO name="LTC In" id="48" direction="Input" default-type="audio" user-latency="0">
<Port type="audio" name="LTC-in">
<Connection other="system:capture_1"/>
</Port>
</IO>
</LTC-In>
<LTC-Out>
<IO name="LTC Out" id="48" direction="Output" default-type="audio" user-latency="0">
<IO name="LTC Out" id="49" direction="Output" default-type="audio" user-latency="0">
<Port type="audio" name="LTC-out"/>
</IO>
</LTC-Out>
......@@ -835,15 +835,15 @@
<Meter pulse="0" frame="0" movable="0" lock-style="AudioTime" bbt="1|1|0" beat="0" note-type="4" divisions-per-bar="4"/>
</TempoMap>
<ControlProtocols>
<Protocol name="PreSonus FaderPort8" active="0"/>
<Protocol name="Ableton Push 2" active="0"/>
<Protocol name="Generic MIDI" feedback="0" feedback-interval="10000" threshold="10" motorized="0" active="1">
<Controls/>
</Protocol>
<Protocol name="Steinberg CC121" active="0"/>
<Protocol name="PreSonus FaderPort" active="0"/>
<Protocol name="Mackie" active="0"/>
<Protocol name="Open Sound Control (OSC)" active="0"/>
<Protocol name="PreSonus FaderPort8" active="0"/>
<Protocol name="Mackie" active="0"/>
<Protocol name="Ableton Push 2" active="0"/>
<Protocol name="Generic MIDI" active="0"/>
<Protocol name="PreSonus FaderPort" active="0"/>
</ControlProtocols>
<Extra>
<RulerVisibility timecode="0" bbt="0" samples="0" minsec="1" tempo="0" meter="0" marker="0" rangemarker="0" transportmarker="0" cdmarker="0" videotl="0"/>
......@@ -852,7 +852,7 @@
<Window name="session-options-editor" visible="0" x-off="0" y-off="234" x-size="777" y-size="353"/>
<Window name="speaker-config" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="about" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="add-routes" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="add-routes" visible="0" x-off="-1" y-off="-1" x-size="772" y-size="491"/>
<Window name="add-video" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="inspector" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="audio-midi-setup" visible="0" x-off="331" y-off="342" x-size="655" y-size="410"/>
......@@ -867,7 +867,6 @@
<Window name="RPM-54" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="RPM-213" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="RPM-295" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="RPM-1025" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="P-54-85" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="P-54-84" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="P-54-3403" visible="1" x-off="597" y-off="31" x-size="677" y-size="448" custom-ui="1"/>
......@@ -908,20 +907,19 @@
<Window name="PM-327-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="PM-328-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="PM-344-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="RPM-1025" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="P-1025-1061" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="P-1025-1056" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="P-1025-1057" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="P-1025-1055" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="P-1025-1057" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="P-1025-1058" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="P-1025-1066" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" custom-ui="1"/>
<Window name="PM-1061-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="PM-1056-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="PM-1057-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="PM-1055-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="PM-1057-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="PM-1058-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="PM-1066-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<Window name="P-213-4974" visible="0" x-off="244" y-off="332" x-size="828" y-size="431" custom-ui="1"/>
<Window name="PM-4974-" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
<GUIObjectState>
<Object id="rtav 54" height="68" visible="1"/>
<Object id="automation 58" height="68" visible="0"/>
......@@ -952,7 +950,7 @@
<Object id="strip 295" visible="1" strip-width="Wide">
<Object id="processor 325"/>
</Object>
<Object id="strip 1025" visible="1" strip-width="Wide">
<Object id="strip 1025" visible="1">
<Object id="processor 1055"/>
</Object>
<Object id="rtav 1025" height="68" visible="1"/>
......
......@@ -2,14 +2,15 @@
<instant>
<LastUsedSnapshot name="studio"/>
<Main x="0" y="31" w="1280" h="740" current-tab="editor"/>
<Editor id="41" edit-horizontal-pane-pos="0.89999997615814209" notebook-shrunk="0" edit-vertical-pane-pos="0.89999997615814209" mixer-width="Wide" zoom-focus="ZoomFocusPlayhead" zoom="1957560" snap-to="SnapToBeat" snap-mode="SnapOff" internal-snap-to="SnapToBeat" internal-snap-mode="SnapOff" pre-internal-snap-to="SnapToBeat" pre-internal-snap-mode="SnapOff" edit-point="EditAtMouse" visible-track-count="-1" playhead="168096579" left-frame="0" y-origin="0" show-measures="1" maximised="0" follow-playhead="1" stationary-playhead="0" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" join-object-range="0" show-editor-mixer="0" show-editor-list="1" editor-list-page="0" show-marker-lines="0" nudge-clock-value="220500">
<Editor id="41" edit-horizontal-pane-pos="0.89999997615814209" notebook-shrunk="0" edit-vertical-pane-pos="0.89999997615814209" mixer-width="Wide" zoom-focus="ZoomFocusPlayhead" zoom="1596146" snap-to="SnapToBeat" snap-mode="SnapOff" internal-snap-to="SnapToBeat" internal-snap-mode="SnapOff" pre-internal-snap-to="SnapToBeat" pre-internal-snap-mode="SnapOff" edit-point="EditAtMouse" visible-track-count="-1" playhead="1428670883" left-frame="117337519" y-origin="127" show-measures="1" maximised="0" follow-playhead="0" stationary-playhead="0" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" join-object-range="0" show-editor-mixer="0" show-editor-list="1" editor-list-page="0" show-marker-lines="0" nudge-clock-value="220500">
<Window name="Editor" visible="0" x-off="-1" y-off="-1" x-size="-1" y-size="-1" tabbed="1"/>
<Buttons>
<Press/>
<Release/>
</Buttons>
<Selection>
<StripableView id="3119"/>
<StripableView id="2914"/>
<Marker id="15113" start="1"/>
</Selection>
<RegionList sort-type="ByEndInFile" sort-ascending="1" show-all="0" show-automatic-regions="1"/>
<ActionScript lua="Lua 5.3">c2NyaXB0cyA9IHt9IA==</ActionScript>
......@@ -17,7 +18,7 @@
<EditorLocations clock-mode="BBT"/>
</Editor>
<Mixer mixer-rhs-pane1-pos="0.60000002384185791" mixer-rhs_pane2-pos="0.69999998807907104" mixer-list-hpane-pos="0.0625" mixer-inner-pane-pos="0.80000001192092896" narrow-strips="0" show-mixer="1" show-mixer-list="1" maximised="0" monitor-section-visible="1">
<Window name="Mixer" visible="1" x-off="0" y-off="31" x-size="1280" y-size="740" tabbed="0"/>
<Window name="Mixer" visible="1" x-off="0" y-off="31" x-size="1914" y-size="1091" tabbed="0"/>
<PluginOrder/>
</Mixer>
<Preferences>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment