X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fimport-dialog.html;h=3c0b7bdb26b2fc4f29e82b7c515d2faec4195ab7;hb=3532eaf880572e65dea6acd1f391efa598303111;hp=9fb0a5a9c89d675807d21132d5c13db73edbc9a5;hpb=361fe61057874168e5cd41eaa00c40f43c2f7982;p=ardour-manual

diff --git a/include/import-dialog.html b/include/import-dialog.html
index 9fb0a5a..3c0b7bd 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>
@@ -88,6 +90,34 @@
   quality of the resampling process, if the sampling rate of the source file
   differs from the session rate.
 </p>
+<p>
+  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
@@ -95,3 +125,107 @@
   versus Linking</a> for details.
 </p>
 
+<h2>Importing from FreeSound.org</h2>
+
+<p>
+  Ardour can import sounds from the public library at FreeSound.org.
+  This feature requires an account with the online service.
+</p>
+
+<p>
+  Sound clips on FreeSound.org typically have metadata in form of tags
+  that give a general idea what sound is recorded in a clip. Ardour will
+  use that metadata to find sound clips that match your request.
+</p>
+
+<figure class="right">
+  <img src="/images/freesound-clips-list.png" alt="List of sound clips found on FreeSound.org" width="75%">
+  <figcaption>
+    List of sound clips found on FreeSound.org
+  </figcaption>
+</figure>
+
+<p>
+  There are two more options for the search:
+</p>
+
+<ol>
+  <li><dfn>Sort</dfn>: allows sorting all sound clips that match your
+  request in a particular order. Changing the type of sorting requires
+  running the search again.</li>
+  <li><dfn>License</dfn>: allows limiting your search by choosing
+  a particular license depending on how you license your own work.</li>
+</ol>
+
+<p>
+  Ardour will list all sounds clips that match your request right in the
+  window. If there are a lot of option, click the
+  <kbd class="button">More</kbd> button to load the next page with results.
+</p>
+
+<p>
+  When you click on any sound clip in the list for the first time,
+  a FreeSound.org login page will open in your preferred web browser.
+</p>
+
+<figure class="right">
+  <img src="/images/freesound-login.png" alt="Log into FreeSound.org" width="75%">
+  <figcaption>
+    Log into FreeSound.org
+  </figcaption>
+</figure>
+</p>
+
+<p>
+  You will then be asked to grant access to Ardour.
+</p>
+
+<figure class="right">
+  <img src="/images/freesound-grant-access.png" alt="Grant access to Ardour" width="75%">
+  <figcaption>
+    Grant access to Ardour
+  </figcaption>
+</figure>
+</p>
+
+<p>
+  Once you do that, FreeSound.org will generate authorization code that you need to select and copy to the clipboard.
+</p>
+
+<figure class="right">
+  <img src="/images/freesound-auth-code.png" alt="Authorization token" width="75%">
+  <figcaption>
+    Authorization code
+  </figcaption>
+</figure>
+</p>
+
+<p>
+  Finally, insert the code into the entry box here and click <kbd class="button">OK</kbd>.
+</p>
+
+<figure class="right">
+  <img src="/images/freesound-code-insert.png" alt="Insert authorization token" width="75%">
+  <figcaption>
+    Insert authorization code
+  </figcaption>
+</figure>
+</p>
+
+<p>
+  After that, Ardour will be able to download clips for preview in a folder
+  for temporary files that you can select in the
+  <kbd class="window">Preferences</kbd> dialog on the
+  <kbd class="windows">General</kbd> page.
+</p>
+
+<p>
+  You can preview and insert clips from FreeSound.org like any other sound
+  files.
+</p>
+
+<p>
+  Please note that authorization code only works as long as Ardour is running.
+  The next time you start Ardour, you will need to authorize it again. This is
+  implementation specifics of FreeSound.org.
+</p>