From ce24afc337572ba9f2e0b9693756dde7fcac4543 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arun.raghavan@collabora.co.uk>
Date: Mon, 21 Jun 2010 15:06:25 +0530
Subject: [PATCH] xml: Support ID3 in MP3 profiles

This also makes encoding work, since a container needs to be provided
for encoding.
---
 data/mp3.xml | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/data/mp3.xml b/data/mp3.xml
index d90e321..77d2a9c 100644
--- a/data/mp3.xml
+++ b/data/mp3.xml
@@ -2,6 +2,12 @@
 
 <dlna-profiles>
   <restrictions>
+    <restriction id="ID3" type="container">
+      <field name="name" type="string">
+        <value>application/x-id3</value>
+      </field>
+    </restriction>
+
     <restriction id="MP3" type="audio">
       <field name="name" type="string">
         <value>audio/mpeg</value>
@@ -25,14 +31,7 @@
       </field>
     </restriction>
 
-  </restrictions>
-
-  <dlna-profile name="MP3" mime="audio/mpeg">
-    <parent name="MP3" />
-  </dlna-profile>
-
-  <dlna-profile name="MP3X" mime="audio/mpeg">
-    <restriction type="audio">
+    <restriction id="MP3X" type="audio">
       <parent name="MP3" />
 
       <field name="mpegaudioversion" type="int">
@@ -50,5 +49,23 @@
 	<range min="8000" max="320000" />
       </field>
     </restriction>
+  </restrictions>
+
+  <dlna-profile name="MP3" mime="audio/mpeg">
+    <parent name="ID3" />
+    <parent name="MP3" />
+  </dlna-profile>
+
+  <dlna-profile name="MP3" mime="audio/mpeg">
+    <parent name="MP3" />
+  </dlna-profile>
+
+  <dlna-profile name="MP3X" mime="audio/mpeg">
+    <parent name="ID3" />
+    <parent name="MP3X" />
+  </dlna-profile>
+
+  <dlna-profile name="MP3X" mime="audio/mpeg">
+    <parent name="MP3X" />
   </dlna-profile>
 </dlna-profiles>
-- 
2.1.4