Switch to side-by-side view

--- a/doc/sc2mpd.html
+++ b/doc/sc2mpd.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.7" />
 <title>sc2mpd: helper for upmpdcli Songcast support</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,15 +87,9 @@
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-.monospaced, code, pre {
-  font-family: "Courier New", Courier, monospace;
-  font-size: inherit;
-  color: navy;
+pre {
   padding: 0;
   margin: 0;
-}
-pre {
-  white-space: pre-wrap;
 }
 
 #author {
@@ -225,7 +219,7 @@
 }
 
 div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; vertical-align: text-bottom; }
+span.image img { border-style: none; }
 a.image:visited { color: white; }
 
 dl {
@@ -421,6 +415,12 @@
  *
  * */
 
+tt {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
+}
+
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -453,6 +453,12 @@
  * html5 specific
  *
  * */
+
+.monospaced {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
+}
 
 table.tableblock {
   margin-top: 1.0em;
@@ -533,8 +539,6 @@
 @media print {
   body.manpage div#toc { display: none; }
 }
-
-
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -749,7 +753,7 @@
 seems to have fixed 24 bits sound, so this should be now usable for
 MACs. <strong><em>This needs mpd 0.19 on the renderer. Do not try 24 bits sound with
 mpd 0.18 !</em></strong> (or turn the volume very low&#8230;). Using Songcast from a Mac (24
- bits audio) needs <strong>mpd 0.19</strong>, configured with <code>--disable-audiofile</code>.
+ bits audio) needs <strong>mpd 0.19</strong>, configured with <tt>--disable-audiofile</tt>.
 As Debian and Ubuntu tend to lag quite bit on MPD progresses, I have set up
 <a href="downloads.html#mpd">backport repositories</a> for recent mpd versions
 (currently 0.19.9), for Ubuntu, Debian i386/amd64 and Raspbian.</p></div>
@@ -824,13 +828,12 @@
 </li>
 <li>
 <p>
-By directly using the <strong>alsa</strong> audio driver. <strong><em>This only works with 16
-   bits sound for now (so only with a Windows sender, no Macs allowed)</em></strong>
+By directly using the <strong>alsa</strong> audio driver.
 </p>
 </li>
 </ul></div>
 <div class="paragraph"><p>What approach is used is decided by a parameter in the upmpdcli
-configuration file: <code>scplaymethod</code> (see <a href="#Configuration">[Configuration]</a> further)</p></div>
+configuration file: <tt>scplaymethod</tt> (see <a href="#Configuration">[Configuration]</a> further)</p></div>
 <div class="paragraph"><p>Control:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -855,17 +858,17 @@
 </li>
 <li>
 <p>
-If the <em><code>mpd</code></em> method is in use, <strong>upmpdcli</strong> instructs <strong>mpd</strong> to play the
+If the <em><tt>mpd</tt></em> method is in use, <strong>upmpdcli</strong> instructs <strong>mpd</strong> to play the
   URL for the <strong>sc2mpd</strong> output.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>When using <em><code>mpd</code></em> more bufferisation occurs and there may be a significant
+<div class="paragraph"><p>When using <em><tt>mpd</tt></em> more bufferisation occurs and there may be a significant
 delay (up to around 10S) between the time when Songcast is activated and
 the time sound appears.</p></div>
 <div class="paragraph"><p>Given the bufferisation and delay control issues when going through MPD,
-only the <em><code>alsa</code></em> method is usable in multi-room configurations. Even with a
-single player, the <em><code>mpd</code></em> method will experience skips from time to
+only the <em><tt>alsa</tt></em> method is usable in multi-room configurations. Even with a
+single player, the <em><tt>mpd</tt></em> method will experience skips from time to
 time. The reasons are explained in the <a href="scmulti.html">multi-room</a>
 page.</p></div>
 </div>
@@ -877,16 +880,16 @@
 <div class="paragraph"><p>So add the repositories:</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><code>echo deb http://www.lesbonscomptes.com/upmpdcli/downloads/debian/ unstable main | sudo tee /etc/apt/sources.list.d/upmpdcli.list
+<pre><tt>echo deb http://www.lesbonscomptes.com/upmpdcli/downloads/debian/ unstable main | sudo tee /etc/apt/sources.list.d/upmpdcli.list
 echo deb-src http://www.lesbonscomptes.com/upmpdcli/downloads/debian/ unstable main | sudo tee -a /etc/apt/sources.list.d/upmpdcli.list
 echo deb http://www.lesbonscomptes.com/upmpdcli/downloads/mpd-debian/ unstable main  | sudo tee -a /etc/apt/sources.list.d/upmpdcli.list
-echo deb-src http://www.lesbonscomptes.com/upmpdcli/downloads/mpd-debian/ unstable main  | sudo tee -a /etc/apt/sources.list.d/upmpdcli.list</code></pre>
+echo deb-src http://www.lesbonscomptes.com/upmpdcli/downloads/mpd-debian/ unstable main  | sudo tee -a /etc/apt/sources.list.d/upmpdcli.list</tt></pre>
 </div></div>
 <div class="paragraph"><p>Install (the mpd and libupnp versions in the repo have bug fixes):</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><code>sudo apt-get update
-sudo apt-get install upmpdcli sc2mpd mpd libupnp6</code></pre>
+<pre><tt>sudo apt-get update
+sudo apt-get install upmpdcli sc2mpd mpd libupnp6</tt></pre>
 </div></div>
 <div class="paragraph"><p>And seed the next section for configuring.</p></div>
 </div>
@@ -900,16 +903,33 @@
 <strong>upmpdcli</strong> will advertise the Songcast capability, and any host with a
 Songcast sender installed should be able to use it.</p></div>
 <div class="paragraph"><p>However, you can set a number of values in the upmpdcli configuration file
-(you <strong>must</strong> set the <strong>upmpdcli</strong> <code>-c</code> option for <strong>sc2mpd</strong> to see them, the
+(you <strong>must</strong> set the <strong>upmpdcli</strong> <tt>-c</tt> option for <strong>sc2mpd</strong> to see them, the
 environment variable will not work):</p></div>
 <div class="dlist"><dl>
+<dt class="hdlist1">
+sclogfilename
+</dt>
+<dd>
+<p>
+Name of the file which will receive <strong>sc2mpd</strong> log messages. <tt>stderr</tt> by
+default. This <em>can&#8217;t be</em> the same file used by <strong>upmpdcli</strong>.
+</p>
+</dd>
+<dt class="hdlist1">
+scloglevel
+</dt>
+<dd>
+<p>
+Log verbosity.
+</p>
+</dd>
 <dt class="hdlist1">
 scplaymethod
 </dt>
 <dd>
 <p>
-This decides how audio is played, with 2 possible
-values, <em><code>alsa</code></em> or <em><code>mpd</code></em>. Using <em><code>mpd</code></em> is somewhat easier, but
+Used by <strong>upmpdcli</strong> and <strong>sc2mpd</strong>.  This decides how audio is played, with 2
+possible values, <em><tt>alsa</tt></em> or <em><tt>mpd</tt></em>. Using <em><tt>mpd</tt></em> is somewhat easier, but
 unusable in <a href="scmulti.html">multi-room</a> configurations, and you risk
 small drops even in single-player settings.
 </p>
@@ -919,27 +939,22 @@
 </dt>
 <dd>
 <p>
-If the <em><code>alsa</code></em> method is set, the <code>scalsadevice</code>
-parameter defines the interface name. Use <code>aplay -L</code> to find the
-appropriate name. Also check that user <em><code>upmpdcli</code></em> belongs to the
-<em><code>audio</code></em> group.
+If the <em><tt>alsa</tt></em> method is set, the <tt>scalsadevice</tt>
+parameter defines the interface name. Use <tt>aplay -L</tt> to find the
+appropriate name. Also check that user <em><tt>upmpdcli</tt></em> belongs to the
+<em><tt>audio</tt></em> group.
 </p>
 </dd>
 <dt class="hdlist1">
-sclogfilename
+sccvttype
 </dt>
 <dd>
 <p>
-Name of the file which will receive <strong>sc2mpd</strong> log messages. <code>stderr</code> by
-default. This <em>can&#8217;t be</em> the same file used by <strong>upmpdcli</strong>.
-</p>
-</dd>
-<dt class="hdlist1">
-scloglevel
-</dt>
-<dd>
-<p>
-Log verbosity.
+If the <em><tt>alsa</tt></em> play method is used, this defines the libsamplerate
+converter type. See <a href="http://www.mega-nerd.com/SRC/api_misc.html#Converters">http://www.mega-nerd.com/SRC/api_misc.html#Converters</a>.
+The default is to use SRC_CVT_FASTEST, resulting in around 24% CPU usage
+for sc2mpd processing a 16 bits stream on a Raspberry Pi 1. The value can
+be specified either as a string (e.g SRC_SINC_FASTEST), or a value (e.g 2).
 </p>
 </dd>
 <dt class="hdlist1">
@@ -947,9 +962,9 @@
 </dt>
 <dd>
 <p>
-If the <em><code>mpd</code></em> method is set, this defines the HTTP port used by <strong>mpd</strong> to
+If the <em><tt>mpd</tt></em> method is set, this defines the HTTP port used by <strong>mpd</strong> to
 connect to <strong>sc2mpd</strong>. 8768 by default. This must be an available port on
-<code>localhost</code>, and it will only accept connections from <code>localhost</code>.
+<tt>localhost</tt>, and it will only accept connections from <tt>localhost</tt>.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -957,11 +972,11 @@
 </dt>
 <dd>
 <p>
-Path for the <strong>sc2mpd</strong> executable file (e.g. <code>/usr/local/bin/sc2mpd</code>). Only
-useful if <strong>sc2mpd</strong> was not installed to a location in the executable $PATH
-set for the init scripts. Typically only <code>/bin</code> and <code>/usr/bin</code> are in
-there. This allows <strong>upmpdcli</strong> to find <strong>sc2mpd</strong> if it is not in the standard
-location.
+Used by <strong>upmpdcli</strong>. Path for the <strong>sc2mpd</strong> executable file
+(e.g. <tt>/usr/local/bin/sc2mpd</tt>). Only useful if <strong>sc2mpd</strong> was not installed
+to a location in the executable $PATH set for the init scripts. Typically
+only <tt>/bin</tt> and <tt>/usr/bin</tt> are in there. This allows <strong>upmpdcli</strong> to find
+<strong>sc2mpd</strong> if it is not in the standard location.
 </p>
 </dd>
 </dl></div>
@@ -1031,9 +1046,9 @@
 Openhome Git repositories and build the libs:</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><code>cd sc2mpd
+<pre><tt>cd sc2mpd
 mkdir /my/place/for/openhome
-sh ohbuild.sh /my/place/for/openhome</code></pre>
+sh ohbuild.sh /my/place/for/openhome</tt></pre>
 </div></div>
 <div class="paragraph"><p>Miscellaneous error messages will be displayed during the build. Hope for
 the best&#8230;</p></div>
@@ -1041,10 +1056,10 @@
 <em>sc2mpd</em> directory:</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><code>sh autogen.sh
+<pre><tt>sh autogen.sh
 ./configure --prefix=/usr --with-openhome=/my/place/for/openhome
 make
-sudo make install</code></pre>
+sudo make install</tt></pre>
 </div></div>
 <div class="paragraph"><p>The build uses static Openhome libraries, so you can move the executable to
 another machine without needing the Openhome directory (don&#8217;t forget to
@@ -1066,7 +1081,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-07-19 18:32:36 CEST
+Last updated 2015-07-27 09:57:59 CEST
 </div>
 </div>
 </body>