core,data,doc: Drop transcoder options

Add a new [MediaEngine] section and add a "transcoders" list.

2 files changed, 15 insertions, 175 deletions

diff --git a/doc/man/rygel.conf.xml b/doc/man/rygel.conf.xml
index 1d704768..9a2c6d19 100644
--- a/doc/man/rygel.conf.xml
+++ b/doc/man/rygel.conf.xml
@@ -147,66 +147,6 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       </varlistentry>
       <varlistentry>
         <term>
-          <option>enable-mp3-transcoder</option>
-        </term>
-        <listitem>
-          <para>Set to <userinput>true</userinput> to enable transcoding to MP3.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>enable-mp2ts-transcoder</option>
-        </term>
-        <listitem>
-          <para>
-            Set to <userinput>true</userinput> to enable transcoding to MPEG2
-            in TS container.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>enable-lpcm-transcoder</option>
-        </term>
-        <listitem>
-          <para>
-            Set to <userinput>true</userinput> to enable transcoding to Linear PCM.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>enable-wmv-transcoder</option>
-        </term>
-        <listitem>
-          <para>
-            Set to <userinput>true</userinput> to enable transcoding to WMV.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>enable-aac-transcoder</option>
-        </term>
-        <listitem>
-          <para>
-            Set to <userinput>true</userinput> to enable transcoding to AAC.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>enable-avc-transcoder</option>
-        </term>
-        <listitem>
-          <para>
-            Set to <userinput>true</userinput> to enable transcoding to AVC.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
           <option>log-level=<replaceable>DOMAIN</replaceable>:<replaceable>LEVEL</replaceable>[,<replaceable>DOMAIN</replaceable>:<replaceable>LEVEL</replaceable>,…]</option>
         </term>
         <listitem>
@@ -304,6 +244,20 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
     </variablelist>
   </refsect1>
   <refsect1>
+    <title>Media Engine settings</title>
+    <para>The settings in this <code>[MediaEngine]</code> section  are specific to the media engine used. This document lists the options available for the <ulink url="http://gstreamer.freedesktop.org">GStreamer</ulink> media engine.</para>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <option>transcoders</option>
+        </term>
+        <listitem>
+          <para>A semicolon-separated list of the active transcoders. This setting has no effect if <option>enable-transcoding</option> is set to <code>false</code>. Possible values are: <code>lpcm,mp3,mp2ts,aac,avc</code> or <code>wmv</code>. Its default value is <code>lpcm;mp3;mp2ts;aac;wmv</code>.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
     <title>Tracker Plugin</title>
     <para>The tracker plugin uses the centralized database of meta information
       from the tracker project. See the
@@ -472,7 +426,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
           <option>identifier-dlnaprofile</option>
         </term>
         <listitem>
-            <para>DLNA profile for the stream.</para>
+          <para>DLNA profile for the stream.</para>
         </listitem>
       </varlistentry>
     </variablelist>
diff --git a/doc/man/rygel.xml b/doc/man/rygel.xml
index a22aaaf2..ae90d102 100644
--- a/doc/man/rygel.xml
+++ b/doc/man/rygel.xml
@@ -178,72 +178,6 @@ handling.</para>
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-m</option>
-        </term>
-        <term>
-          <option>--disable-mp3-transcoder</option>
-        </term>
-        <listitem>
-          <para>Disable transcoding to MP3.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>-s</option>
-        </term>
-        <term>
-          <option>--disable-mp2ts-transcoder</option>
-        </term>
-        <listitem>
-          <para>Disable transcoding to MPEG2 in TS container.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>-l</option>
-        </term>
-        <term>
-          <option>--disable-lpcm-transcoder</option>
-        </term>
-        <listitem>
-          <para>Disable transcoding to Linear PCM.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>-w</option>
-        </term>
-        <term>
-          <option>--disable-wmv-transcoder</option>
-        </term>
-        <listitem>
-          <para>Disable transcoding to WMV.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>-a</option>
-        </term>
-        <term>
-          <option>--disable-aac-transcoder</option>
-        </term>
-        <listitem>
-          <para>Disable transcoding to AAC.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>-z</option>
-        </term>
-        <term>
-          <option>--disable-avc-transcoder</option>
-        </term>
-        <listitem>
-          <para>Disable transcoding to AVC.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
           <option>-U</option>
         </term>
         <term>
@@ -420,54 +354,6 @@ handling.</para>
       </varlistentry>
       <varlistentry>
         <term>
-          <envar>RYGEL_DISABLE_MP3_TRANS</envar>
-        </term>
-        <listitem>
-          <para>Disable the MP3 transcoder.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>RYGEL_DISABLE_LPCM_TRANS</envar>
-        </term>
-        <listitem>
-          <para>Disable the Linear PCM transcoder.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>RYGEL_DISABLE_MP2TS_TRANS</envar>
-        </term>
-        <listitem>
-          <para>Disable the MPEG2 in TS transcoder.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>RYGEL_DISABLE_WMV_TRANS</envar>
-        </term>
-        <listitem>
-          <para>Disable transcoding to WMV format.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>RYGEL_DISABLE_AAC_TRANS</envar>
-        </term>
-        <listitem>
-          <para>Disable transcoding to AAC format.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <envar>RYGEL_DISABLE_AVC_TRANS</envar>
-        </term>
-        <listitem>
-          <para>Disable transcoding to AVC format.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
           <envar>RYGEL_LOG</envar>
         </term>
         <listitem>