From 0e127ce41d7120d505f3aa9ae18dce679f403a3f Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Mon, 13 Feb 2017 13:38:01 -0600 Subject: [PATCH] Collapse diagrams/ into images/. --- .../08_midi-track-controls.html | 2 +- .../01_monitoring/02_monitor-signal-flow.html | 6 +++--- _manual/20_mixing/01_muting-and-soloing.html | 4 ++-- .../02_latency-and-latency-compensation.html | 4 ++-- .../03_timecode-generators-and-slaves.html | 2 +- explode.py | 6 +++--- implode.py | 6 +++--- source/{diagrams => images}/ardour-monitoring.png | Bin source/{diagrams => images}/editor-summary.png | Bin source/{diagrams => images}/external-monitoring.png | Bin .../{diagrams => images}/jack-latency-excerpt.png | Bin source/{diagrams => images}/jack-monitoring.png | Bin source/{diagrams => images}/latency-chain.png | Bin .../ltc-transport-alignment.png | Bin source/{diagrams => images}/mixer-summary.png | Bin source/{diagrams => images}/solo-mute.png | Bin .../typical-midi-track-controls.png | Bin 17 files changed, 15 insertions(+), 15 deletions(-) rename source/{diagrams => images}/ardour-monitoring.png (100%) rename source/{diagrams => images}/editor-summary.png (100%) rename source/{diagrams => images}/external-monitoring.png (100%) rename source/{diagrams => images}/jack-latency-excerpt.png (100%) rename source/{diagrams => images}/jack-monitoring.png (100%) rename source/{diagrams => images}/latency-chain.png (100%) rename source/{diagrams => images}/ltc-transport-alignment.png (100%) rename source/{diagrams => images}/mixer-summary.png (100%) rename source/{diagrams => images}/solo-mute.png (100%) rename source/{diagrams => images}/typical-midi-track-controls.png (100%) diff --git a/_manual/11_working-with-tracks/08_midi-track-controls.html b/_manual/11_working-with-tracks/08_midi-track-controls.html index 6639e93..01129db 100644 --- a/_manual/11_working-with-tracks/08_midi-track-controls.html +++ b/_manual/11_working-with-tracks/08_midi-track-controls.html @@ -4,7 +4,7 @@ title: MIDI Track Controls ---

A typical MIDI track header looks like this:

-midi track controls

diff --git a/_manual/16_recording/01_monitoring/02_monitor-signal-flow.html b/_manual/16_recording/01_monitoring/02_monitor-signal-flow.html index 20a9f9a..9cbe088 100644 --- a/_manual/16_recording/01_monitoring/02_monitor-signal-flow.html +++ b/_manual/16_recording/01_monitoring/02_monitor-signal-flow.html @@ -8,7 +8,7 @@ menu_title: Signal Flow

External Monitoring

+src="/images/external-monitoring.png" />

When using external monitoring, Ardour plays no role in monitoring at all. Perhaps the recording set-up has an external mixer which can be used to set up monitor mixes, or perhaps the sound-card being used @@ -17,7 +17,7 @@ src="/diagrams/external-monitoring.png" /> settings are less flexible and not saved with the session.

JACK-Based Hardware Monitoring

- +

Some sound cards have the ability to mix signals from their inputs to their outputs with very low or even zero latency, a feature called hardware monitoring. @@ -28,7 +28,7 @@ src="/diagrams/external-monitoring.png" />

Software Monitoring

- +

With the software monitoring approach, all monitoring is performed by Ardour — it makes track inputs available at track outputs, governed by various controls. This approach will almost always have diff --git a/_manual/20_mixing/01_muting-and-soloing.html b/_manual/20_mixing/01_muting-and-soloing.html index 9d00564..92806fe 100644 --- a/_manual/20_mixing/01_muting-and-soloing.html +++ b/_manual/20_mixing/01_muting-and-soloing.html @@ -73,8 +73,8 @@ title: Muting and Soloing

The solo-mute arrangement with a monitor bus is shown below:

-mute/solo signal flow -

+mute/solo signal flow +

Here we have a number of tracks or busses (in orange). Each one has an output which feeds the master bus. In addition, each has PFL and AFL outputs; we have a choice of which to use. PFL/AFL from each track or diff --git a/_manual/22_synchronization/02_latency-and-latency-compensation.html b/_manual/22_synchronization/02_latency-and-latency-compensation.html index 28494a6..c93b684 100644 --- a/_manual/22_synchronization/02_latency-and-latency-compensation.html +++ b/_manual/22_synchronization/02_latency-and-latency-compensation.html @@ -48,7 +48,7 @@ menu_title: Latency

The Latency chain

-Latency chain +Latency chain

Figure: Latency chain. The numbers are an example for a typical PC. With professional gear and an @@ -171,7 +171,7 @@ menu_title: Latency In order to compensate for latency, JACK or JACK applications need to know exactly how long a certain signal needs to be read-ahead or delayed:

-Jack Latency Compensation +Jack Latency Compensation

Figure: Jack Latency Compensation.

diff --git a/_manual/22_synchronization/03_timecode-generators-and-slaves.html b/_manual/22_synchronization/03_timecode-generators-and-slaves.html index 75cb4dd..e68a22a 100644 --- a/_manual/22_synchronization/03_timecode-generators-and-slaves.html +++ b/_manual/22_synchronization/03_timecode-generators-and-slaves.html @@ -233,7 +233,7 @@ title: Timecode Generators and Slaves the video Frame boundaries.

-LTC frame alignment +LTC frame alignment

Figure: LTC frame alignment for the 525/60 TV standard

diff --git a/explode.py b/explode.py index 72606ff..5506e90 100755 --- a/explode.py +++ b/explode.py @@ -114,9 +114,6 @@ for line in master: if 'link' in header: explode.write('link: ' + header['link'] + '\n') - if 'uri' in header: - explode.write('uri: ' + header['uri'] + '\n') - if 'style' in header: explode.write('style: ' + header['style'] + '\n') @@ -129,6 +126,9 @@ for line in master: explode.write('include: ' + inclFile + '\n') filenames.append(inclFile) + if 'uri' in header: + explode.write('uri: ' + header['uri'] + '\n') + explode.write('part: ' + header['part'] + '\n' + '---\n') # Only parts have no content... diff --git a/implode.py b/implode.py index f98d2ec..0513416 100755 --- a/implode.py +++ b/implode.py @@ -94,9 +94,6 @@ for line in master: if 'link' in header: implode.write('link: ' + header['link'] + '\n') - if 'uri' in header: - implode.write('uri: ' + header['uri'] + '\n') - if 'style' in header: implode.write('style: ' + header['style'] + '\n') @@ -107,6 +104,9 @@ for line in master: implode.write('include: ' + header['include'] + '\n') implode.write('exclude: yes\n') + if 'uri' in header: + implode.write('uri: ' + header['uri'] + '\n') + implode.write('part: ' + header['part'] + '\n' + '---\n') # Only parts have no content... diff --git a/source/diagrams/ardour-monitoring.png b/source/images/ardour-monitoring.png similarity index 100% rename from source/diagrams/ardour-monitoring.png rename to source/images/ardour-monitoring.png diff --git a/source/diagrams/editor-summary.png b/source/images/editor-summary.png similarity index 100% rename from source/diagrams/editor-summary.png rename to source/images/editor-summary.png diff --git a/source/diagrams/external-monitoring.png b/source/images/external-monitoring.png similarity index 100% rename from source/diagrams/external-monitoring.png rename to source/images/external-monitoring.png diff --git a/source/diagrams/jack-latency-excerpt.png b/source/images/jack-latency-excerpt.png similarity index 100% rename from source/diagrams/jack-latency-excerpt.png rename to source/images/jack-latency-excerpt.png diff --git a/source/diagrams/jack-monitoring.png b/source/images/jack-monitoring.png similarity index 100% rename from source/diagrams/jack-monitoring.png rename to source/images/jack-monitoring.png diff --git a/source/diagrams/latency-chain.png b/source/images/latency-chain.png similarity index 100% rename from source/diagrams/latency-chain.png rename to source/images/latency-chain.png diff --git a/source/diagrams/ltc-transport-alignment.png b/source/images/ltc-transport-alignment.png similarity index 100% rename from source/diagrams/ltc-transport-alignment.png rename to source/images/ltc-transport-alignment.png diff --git a/source/diagrams/mixer-summary.png b/source/images/mixer-summary.png similarity index 100% rename from source/diagrams/mixer-summary.png rename to source/images/mixer-summary.png diff --git a/source/diagrams/solo-mute.png b/source/images/solo-mute.png similarity index 100% rename from source/diagrams/solo-mute.png rename to source/images/solo-mute.png diff --git a/source/diagrams/typical-midi-track-controls.png b/source/images/typical-midi-track-controls.png similarity index 100% rename from source/diagrams/typical-midi-track-controls.png rename to source/images/typical-midi-track-controls.png