[SCM] gerbera/master: Regenerate config.xml from builtin default config

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Sat Sep 23 17:48:18 UTC 2017


The following commit has been merged in the master branch:
commit f2f1752e9f9fca6208d7dcc6e265c4bbaf08a396
Author: James Cowgill <jcowgill at debian.org>
Date:   Sat Sep 23 17:02:11 2017 +0100

    Regenerate config.xml from builtin default config

diff --git a/debian/config.xml b/debian/config.xml
index 30fbc24..955f72d 100644
--- a/debian/config.xml
+++ b/debian/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<config version="1" xmlns="http://mediatomb.cc/config/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/1 http://mediatomb.cc/config/1.xsd">
+<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
   <!--
-     Read /usr/share/doc/gerbera/README.gz section 6 for more
+     See http://gerbera.io or read the docs for more
      information on creating and using config.xml configuration files.
     -->
   <server>
@@ -10,10 +10,20 @@
         <account user="gerbera" password="gerbera"/>
       </accounts>
     </ui>
-    <name>Gerbera</name>
+    <name>gerbera</name>
     <udn/>
     <home>/var/lib/gerbera</home>
     <webroot>/usr/share/gerbera/web</webroot>
+    <!--
+        How frequently (in seconds) to send ssdp:alive advertisements.
+        Minimum alive value accepted is: 62
+
+        The advertisement will be sent every (A/2)-30 seconds,
+        and will have a cache-control max-age of A where A is
+        the value configured here. Ex: A value of 62 will result
+        in an SSDP advertisement being sent every second.
+    -->
+    <alive>1800</alive>
     <storage>
       <sqlite3 enabled="yes">
         <database-file>gerbera.db</database-file>
@@ -42,14 +52,11 @@
        <upnp-string-limit>101</upnp-string-limit>
     -->
     <extended-runtime-options>
-      <ffmpegthumbnailer enabled="no">
-        <thumbnail-size>128</thumbnail-size>
-        <seek-percentage>5</seek-percentage>
-        <filmstrip-overlay>yes</filmstrip-overlay>
-        <workaround-bugs>no</workaround-bugs>
-      </ffmpegthumbnailer>
       <mark-played-items enabled="no" suppress-cds-updates="yes">
         <string mode="prepend">*</string>
+        <mark>
+          <content>video</content>
+        </mark>
       </mark-played-items>
     </extended-runtime-options>
   </server>
@@ -59,13 +66,16 @@
       <playlist-script>/usr/share/gerbera/js/playlists.js</playlist-script>
       <virtual-layout type="builtin">
         <import-script>/usr/share/gerbera/js/import.js</import-script>
-        <dvd-script>/usr/share/gerbera/js/import-dvd.js</dvd-script>
       </virtual-layout>
     </scripting>
     <mappings>
       <extension-mimetype ignore-unknown="no">
         <map from="mp3" to="audio/mpeg"/>
-        <map from="ogg" to="application/ogg"/>
+        <map from="ogx" to="application/ogg"/>
+        <map from="ogv" to="video/ogg"/>
+        <map from="oga" to="audio/ogg"/>
+        <map from="ogg" to="audio/ogg"/>
+        <map from="ogm" to="video/ogg"/>
         <map from="asf" to="video/x-ms-asf"/>
         <map from="asx" to="video/x-ms-asf"/>
         <map from="wma" to="audio/x-ms-wma"/>
@@ -93,7 +103,10 @@
       <mimetype-contenttype>
         <treat mimetype="audio/mpeg" as="mp3"/>
         <treat mimetype="application/ogg" as="ogg"/>
+        <treat mimetype="audio/ogg" as="ogg"/>
         <treat mimetype="audio/x-flac" as="flac"/>
+        <treat mimetype="audio/x-ms-wma" as="wma"/>
+        <treat mimetype="audio/x-wavpack" as="wv"/>
         <treat mimetype="image/jpeg" as="jpg"/>
         <treat mimetype="audio/x-mpegurl" as="playlist"/>
         <treat mimetype="audio/x-scpls" as="playlist"/>
@@ -102,30 +115,18 @@
         <treat mimetype="video/x-msvideo" as="avi"/>
         <treat mimetype="video/mp4" as="mp4"/>
         <treat mimetype="audio/mp4" as="mp4"/>
-        <treat mimetype="application/x-iso9660" as="dvd"/>
-        <treat mimetype="application/x-iso9660-image" as="dvd"/>
         <treat mimetype="video/x-matroska" as="mkv"/>
         <treat mimetype="audio/x-matroska" as="mka"/>
       </mimetype-contenttype>
     </mappings>
     <online-content>
-      <!-- Make sure to setup a transcoding profile for flv -->
-      <YouTube enabled="no" refresh="28800" update-at-start="no" purge-after="604800" racy-content="exclude" format="flv" hd="no">
+      <YouTube enabled="no" refresh="28800" update-at-start="no" purge-after="604800" racy-content="exclude" format="mp4" hd="no">
         <favorites user="gerbera"/>
         <standardfeed feed="most_viewed" time-range="today"/>
         <playlists user="gerbera"/>
         <uploads user="gerbera"/>
         <standardfeed feed="recently_featured" time-range="today"/>
       </YouTube>
-      <Weborama enabled="no" refresh="28800" update-at-start="no">
-        <playlist name="Active" type="playlist" mood="active"/>
-        <playlist name="Metal" type="playlist">
-          <filter>
-            <genres>metal</genres>
-          </filter>
-        </playlist>
-      </Weborama>
-      <AppleTrailers enabled="no" refresh="43200" update-at-start="no" resolution="640"/>
     </online-content>
   </import>
   <transcoding enabled="no">
diff --git a/debian/examples/config.xml b/debian/examples/config.xml
index f564565..dba53de 100644
--- a/debian/examples/config.xml
+++ b/debian/examples/config.xml
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<config version="1" xmlns="http://mediatomb.cc/config/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/1 http://mediatomb.cc/config/1.xsd">
+<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
   <!--
-     Read /usr/share/doc/gerbera/README.gz section 6 for more
+     See http://gerbera.io or read the docs for more
      information on creating and using config.xml configuration files.
     -->
   <server>
-    <ui enabled="yes" show-tooltips="yes">
+    <ui enabled="no" show-tooltips="yes">
       <accounts enabled="no" session-timeout="30">
         <account user="gerbera" password="gerbera"/>
       </accounts>
     </ui>
-    <name>Gerbera</name>
+    <name>gerbera</name>
     <udn/>
     <home>/var/lib/gerbera</home>
     <webroot>/usr/share/gerbera/web</webroot>
+    <!--
+        How frequently (in seconds) to send ssdp:alive advertisements.
+        Minimum alive value accepted is: 62
+
+        The advertisement will be sent every (A/2)-30 seconds,
+        and will have a cache-control max-age of A where A is
+        the value configured here. Ex: A value of 62 will result
+        in an SSDP advertisement being sent every second.
+    -->
+    <alive>1800</alive>
     <storage>
       <sqlite3 enabled="yes">
         <database-file>gerbera.db</database-file>
@@ -42,14 +52,11 @@
        <upnp-string-limit>101</upnp-string-limit>
     -->
     <extended-runtime-options>
-      <ffmpegthumbnailer enabled="no">
-        <thumbnail-size>128</thumbnail-size>
-        <seek-percentage>5</seek-percentage>
-        <filmstrip-overlay>yes</filmstrip-overlay>
-        <workaround-bugs>no</workaround-bugs>
-      </ffmpegthumbnailer>
       <mark-played-items enabled="no" suppress-cds-updates="yes">
         <string mode="prepend">*</string>
+        <mark>
+          <content>video</content>
+        </mark>
       </mark-played-items>
     </extended-runtime-options>
   </server>
@@ -59,13 +66,16 @@
       <playlist-script>/usr/share/gerbera/js/playlists.js</playlist-script>
       <virtual-layout type="builtin">
         <import-script>/usr/share/gerbera/js/import.js</import-script>
-        <dvd-script>/usr/share/gerbera/js/import-dvd.js</dvd-script>
       </virtual-layout>
     </scripting>
     <mappings>
       <extension-mimetype ignore-unknown="no">
         <map from="mp3" to="audio/mpeg"/>
-        <map from="ogg" to="application/ogg"/>
+        <map from="ogx" to="application/ogg"/>
+        <map from="ogv" to="video/ogg"/>
+        <map from="oga" to="audio/ogg"/>
+        <map from="ogg" to="audio/ogg"/>
+        <map from="ogm" to="video/ogg"/>
         <map from="asf" to="video/x-ms-asf"/>
         <map from="asx" to="video/x-ms-asf"/>
         <map from="wma" to="audio/x-ms-wma"/>
@@ -93,7 +103,10 @@
       <mimetype-contenttype>
         <treat mimetype="audio/mpeg" as="mp3"/>
         <treat mimetype="application/ogg" as="ogg"/>
+        <treat mimetype="audio/ogg" as="ogg"/>
         <treat mimetype="audio/x-flac" as="flac"/>
+        <treat mimetype="audio/x-ms-wma" as="wma"/>
+        <treat mimetype="audio/x-wavpack" as="wv"/>
         <treat mimetype="image/jpeg" as="jpg"/>
         <treat mimetype="audio/x-mpegurl" as="playlist"/>
         <treat mimetype="audio/x-scpls" as="playlist"/>
@@ -102,30 +115,18 @@
         <treat mimetype="video/x-msvideo" as="avi"/>
         <treat mimetype="video/mp4" as="mp4"/>
         <treat mimetype="audio/mp4" as="mp4"/>
-        <treat mimetype="application/x-iso9660" as="dvd"/>
-        <treat mimetype="application/x-iso9660-image" as="dvd"/>
         <treat mimetype="video/x-matroska" as="mkv"/>
         <treat mimetype="audio/x-matroska" as="mka"/>
       </mimetype-contenttype>
     </mappings>
     <online-content>
-      <!-- Make sure to setup a transcoding profile for flv -->
-      <YouTube enabled="no" refresh="28800" update-at-start="no" purge-after="604800" racy-content="exclude" format="flv" hd="no">
+      <YouTube enabled="no" refresh="28800" update-at-start="no" purge-after="604800" racy-content="exclude" format="mp4" hd="no">
         <favorites user="gerbera"/>
         <standardfeed feed="most_viewed" time-range="today"/>
         <playlists user="gerbera"/>
         <uploads user="gerbera"/>
         <standardfeed feed="recently_featured" time-range="today"/>
       </YouTube>
-      <Weborama enabled="no" refresh="28800" update-at-start="no">
-        <playlist name="Active" type="playlist" mood="active"/>
-        <playlist name="Metal" type="playlist">
-          <filter>
-            <genres>metal</genres>
-          </filter>
-        </playlist>
-      </Weborama>
-      <AppleTrailers enabled="no" refresh="43200" update-at-start="no" resolution="640"/>
     </online-content>
   </import>
   <transcoding enabled="yes">

-- 
gerbera packaging



More information about the pkg-multimedia-commits mailing list