Merge "Add generic MIDI architecture"
diff --git a/src/devices/audio/midi.jd b/src/devices/audio/midi.jd
index c9ab0ff..8c85c31 100644
--- a/src/devices/audio/midi.jd
+++ b/src/devices/audio/midi.jd
@@ -32,6 +32,13 @@
</p>
<p>
+Strictly speaking, MIDI is unrelated to audio. But since MIDI is commonly used with
+music, this article is placed in the audio section.
+</p>
+
+<h2 id="transports">Transports</h2>
+
+<p>
The physical <a href="http://en.wikipedia.org/wiki/Transport_layer">transport layer</a>
specified in original MIDI 1.0 is a current loop with
<a href="http://en.wikipedia.org/wiki/DIN_connector">5-pin DIN</a> connector.
@@ -43,11 +50,6 @@
<a href="http://en.wikipedia.org/wiki/Bluetooth_low_energy">Bluetooth Low Energy</a> (BLE.)
</p>
-<p>
-Strictly speaking, MIDI is unrelated to audio. But since MIDI is commonly used with
-music, this article is placed in the audio section.
-</p>
-
<h2 id="for-android">MIDI for Android</h2>
<p>
@@ -61,7 +63,8 @@
<p>
Beginning with the Android 6.0 (Marshmallow) release, device makers can enable optional MIDI support in the platform.
-Supported transports include USB, draft BLE, and virtual (inter-app).
+Android directly supports USB, draft BLE, and virtual (inter-app) transports.
+Android indirectly supports MIDI 1.0 via an external adapter.
</p>
<p>
diff --git a/src/devices/audio/terminology.jd b/src/devices/audio/terminology.jd
index ef4caa9..54d69f8 100644
--- a/src/devices/audio/terminology.jd
+++ b/src/devices/audio/terminology.jd
@@ -368,6 +368,7 @@
<dd>
Sony/Philips Digital Interface Format. Interconnect for uncompressed PCM. For
details, refer to <a href="http://en.wikipedia.org/wiki/S/PDIF">S/PDIF</a>.
+S/PDIF is the consumer grade variant of <a href="https://en.wikipedia.org/wiki/AES3">AES3</a>.
</dd>
<dt>Thunderbolt</dt>