summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2007-05-22 09:56:01 +0000
committerTim Mayberry <mojofunk@gmail.com>2007-05-22 09:56:01 +0000
commitd811eb184f3baff5858b13fca9ad145e98190ad4 (patch)
tree47fd0ca64ef2006c255cfb04391970810f5fbe41
parent58eb723ed30153287c6cb770a4683a31639b7480 (diff)
Add note to muting tracks about still reading from the playlist
Add empty glossary entry for DSP referenced by note Add entity for playlist git-svn-id: svn://localhost/ardour2/trunk@1904 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--manual/xml/entities.ent2
-rw-r--r--manual/xml/glossary.xml9
-rw-r--r--manual/xml/muting_tracks.xml10
-rw-r--r--manual/xml/removing_tracks.xml7
4 files changed, 23 insertions, 5 deletions
diff --git a/manual/xml/entities.ent b/manual/xml/entities.ent
index 95cd0ef2a5..0279d776b5 100644
--- a/manual/xml/entities.ent
+++ b/manual/xml/entities.ent
@@ -18,3 +18,5 @@
<!ENTITY TRACK_DISPLAY '<link linkend="sn-track-display">Track Display</link>'>
<!ENTITY TRACK_CONTROLS '<link linkend="sn-track-controls">Track Controls</link>'>
+
+<!ENTITY PLAYLIST '<glossterm linkend="gt-playlist">Playlist</glossterm>'>
diff --git a/manual/xml/glossary.xml b/manual/xml/glossary.xml
index e07b2c462a..37801539a7 100644
--- a/manual/xml/glossary.xml
+++ b/manual/xml/glossary.xml
@@ -93,6 +93,15 @@
</para>
</glossdef>
</glossentry>
+
+ <glossentry id="gt-dsp">
+ <glossterm><acronym>DSP</acronym></glossterm>
+ <glossdef>
+ <para>
+ Some reasonable definition here.
+ </para>
+ </glossdef>
+ </glossentry>
</glossdiv>
<glossdiv>
diff --git a/manual/xml/muting_tracks.xml b/manual/xml/muting_tracks.xml
index b4bb151975..627e7daadc 100644
--- a/manual/xml/muting_tracks.xml
+++ b/manual/xml/muting_tracks.xml
@@ -18,13 +18,21 @@
in the &TRACK_CONTROLS; or the <guibutton>mute</guibutton> button in a
tracks &MIXER_STRIP;. Muting a track will silence its output,
right-clicking on a mute button will bring up a pop-up menu that will
- allow you to choose what will be affected by the mute button.
+ allow you to choose what will be affected when muting.
</para>
<mediaobject>
<imageobject>
<imagedata fileref="images/mute_options.png"/>
</imageobject>
</mediaobject>
+ <note>
+ <para>
+ Muting an Audio Track may slightly reduce the amount of
+ <glossterm linkend="gt-dsp">DSP</glossterm> resources required for the
+ session but the audio data referenced by the tracks &PLAYLIST; will
+ still be read from disk.
+ </para>
+ </note>
<!--
A more indepth description needed or perhaps a reference to a section i
on advanced mixing.
diff --git a/manual/xml/removing_tracks.xml b/manual/xml/removing_tracks.xml
index f7a3ff6463..056fdab77d 100644
--- a/manual/xml/removing_tracks.xml
+++ b/manual/xml/removing_tracks.xml
@@ -32,10 +32,9 @@
<warning>
<para>
Removing a track is a permanent operation that cannot be undone. If
- there are no other tracks using the
- <glossterm linkend="gt-playlist">playlist</glossterm> that is in use
- by the track being removed then the playlist will also be removed from
- the session and will no longer be accessible.
+ there are no other tracks using the &PLAYLIST; that is in use by the
+ track being removed then the playlist will also be removed from the
+ session and will no longer be accessible.
</para>
</warning>
<!--