X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fimport-dialog.html;h=3fb1d81d2f808221b4560e06aefe182874cd9144;hb=a61fbacdfcb7a76fe425fada61f49fc85751e47a;hp=9ecf155d45346947745e6f478db779e8f753721f;hpb=1bc084d882bf5792634c5fd08c35eff78de26b02;p=ardour-manual

diff --git a/include/import-dialog.html b/include/import-dialog.html
index 9ecf155..3fb1d81 100644
--- a/include/import-dialog.html
+++ b/include/import-dialog.html
@@ -1,6 +1,6 @@
 
 <figure class="right">
-	<img src="/images/import-window.png" alt="The import window">
+	<img src="/images/import-window.png" alt="The import window" width="50%">
 	<figcaption>
 		The import window.
 	</figcaption>
@@ -15,8 +15,10 @@
 </p>
 <p>
   Importing audio and MIDI data into the session is done with the
-  <dfn>Add Existing Media</dfn> dialog, accessed by the <kbd class="menu">
-  Session &gt; Import</kbd> menu.
+  <dfn>Add Existing Media</dfn> dialog, accessed either by the
+  <kbd class="menu"> Session &gt; Import</kbd> menu or, if any tracks have
+  already been added, by right-clicking on the canvas of the <dfn>Editor</dfn>
+  window and choosing <kbd class="menu">Insert Existing Media</kbd>.
 </p>
 
 <h2>The Soundfile Information Box</h2>
@@ -68,7 +70,7 @@
 <p>
   The <kbd class="menu">Insert at</kbd> option chooses where in time the file will be imported, amongst:
 </p>
-</ul>
+<ul>
   <li>the <dfn>file timestamp</dfn> (if available, zero by default)</li>
   <li>at the <a href="@@edit-point-control"><dfn>edit point</dfn></a></li>
   <li>at the <dfn>playhead</dfn></li>
@@ -89,7 +91,35 @@
   differs from the session rate.
 </p>
 <p>
-  Finally, and most importantly, the the files can be linked or copied to the session
+  There are three MIDI-specific options as well. First off, you can set a track 
+  naming scheme:
+</p>
+<table class="dl">
+  <tr><th>by track number</th><td>will automatically assign every track a name that consists of the imported file name and a track number</td></tr>
+  <tr><th>by track name</th><td>will</td></tr>
+  <tr><th>by instrument name</th><td>will</a></td></tr>
+</table>
+<p>
+<p>
+  You can also optionally import a tempo map from a MIDI file.
+  The <kbd class="menu">Use MIDI Tempo Map (if defined)</kbd> option appears
+  when a MIDI file is selected in the file selection dialog.
+<p>
+<p>
+  The last MIDI-specific option is <kbd class="menu">Import MIDI Markers
+  (if any)</kbd>. If those are present in a MIDI file, they will be rendered
+  right above MIDI clips on the canvas. Editing the MIDI markers is currently
+  unavailable.
+</p>
+<figure class="right">
+	<img src="/images/imported-midi-markers.png" alt="MIDI markers imported from a .mid file" width="75%">
+	<figcaption>
+		MIDI markers imported from a .mid file
+	</figcaption>
+</figure>
+</p>
+<p>
+  Finally, and most importantly, the files can be linked or copied to the session
   with the <kbd class="option">Copy files to session</kbd> checkbox. Please read
   <a href="@@copying-versus-linking">Copying
   versus Linking</a> for details.