From my point of view all of these devices should have the capability

    'portable_audio_player'. Those who are a disk drive with the extra
    feature of playing stuff should probably keep 'storage' as category.
    The rest should have 'portable_audio_player'. Patch from Pierre Ossman
    <drzeus-list@drzeus.cx>.

1 files changed, 45 insertions, 28 deletions

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7897ace4..9c5b9e42 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -8,6 +8,7 @@
       <match key="storage.vendor" contains="Apple">
 	<match key="storage.model" contains="iPod">
 	  <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">storage</merge>
           <merge key="portable_audio_player.type" type="string">ipod</merge>
           <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
@@ -24,8 +25,9 @@
 	<match key="@storage.physical_device:usb.vendor_id" int="0x066f">
           <match key="@storage.physical_device:usb.product_id" int="0x8000">
 	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
             <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -38,8 +40,8 @@
           <match key="@storage.physical_device:usb.product_id" int="0x5042">
 	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
             <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -54,39 +56,44 @@
 	<match key="@storage.physical_device:usb.vendor_id" int="0x4102">
           <!-- iFP 100 UMS (supports application/ogg only after firmware upgrade)-->
 	  <match key="@storage.physical_device:usb.product_id" int="0x1101">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
+            <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	  <!-- iFP 300 UMS (supports application/ogg only after firmware upgrade)-->
 	  <match key="@storage.physical_device:usb.product_id" int="0x1103">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	  <!-- iFP 500 UMS (supports application/ogg only after firmware upgrade)-->
 	  <match key="@storage.physical_device:usb.product_id" int="0x1105">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
 	    <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
           <!-- iFP 700 UMS-->
 	  <match key="@storage.physical_device:usb.product_id" int="0x1107">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -94,10 +101,11 @@
           </match>
           <!-- iFP 800 UMS-->
           <match key="@storage.physical_device:usb.product_id" int="0x1108">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -105,10 +113,11 @@
           </match>
           <!-- iFP 900 UMS-->
           <match key="@storage.physical_device:usb.product_id" int="0x1109">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -116,10 +125,11 @@
           </match>
           <!-- iFP 1000 UMS-->
           <match key="@storage.physical_device:usb.product_id" int="0x1110">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -127,10 +137,11 @@
           </match>
           <!-- N10 UMS-->
           <match key="@storage.physical_device:usb.product_id" int="0x1111">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -138,10 +149,11 @@
           </match>
           <!-- H10 20GB UMS-->
           <match key="@storage.physical_device:usb.product_id" int="0x2001">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -149,10 +161,11 @@
           </match>
           <!-- H10 5GB UMS-->
           <match key="@storage.physical_device:usb.product_id" int="0x2002">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -162,20 +175,22 @@
 	<match key="@storage.physical_device:usb.vendor_id" int="0x1006">
           <!-- iGP 100 -->
           <match key="@storage.physical_device:usb.product_id" int="0x2001">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
           <!-- iHP-100,115 -->
           <match key="@storage.physical_device:usb.product_id" int="0x3001">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -183,10 +198,11 @@
           </match>
           <!-- HP-120,140 -->
           <match key="@storage.physical_device:usb.product_id" int="0x3002">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -194,10 +210,11 @@
           </match>
           <!-- H320, H340 -->
           <match key="@storage.physical_device:usb.product_id" int="0x3003">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
@@ -213,8 +230,8 @@
       <match key="usb.vendor_id" int="0x4102">
 	<!-- iFP 100 IMM (supports application/ogg only after firmware upgrade)-->
 	<match key="usb.product_id" int="0x1001">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -223,8 +240,8 @@
         </match>
 	<!-- iFP 300 IMM (supports application/ogg only after firmware upgrade)-->
 	<match key="usb.product_id" int="0x1003">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -233,8 +250,8 @@
         </match>
 	<!-- iFP 500 IMM (supports application/ogg only after firmware upgrade)-->
 	<match key="usb.product_id" int="0x1005">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -243,8 +260,8 @@
         </match>
         <!-- iFP 700 IMM-->
 	<match key="usb.product_id" int="0x1007">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -254,8 +271,8 @@
         </match>
         <!-- iFP 800 IMM-->
         <match key="usb.product_id" int="0x1008">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -265,8 +282,8 @@
         </match>
         <!-- iFP 900 IMM-->
         <match key="usb.product_id" int="0x1009">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -276,8 +293,8 @@
         </match>
         <!-- iFP 1000 IMM-->
         <match key="usb.product_id" int="0x1010">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -287,8 +304,8 @@
         </match>
         <!-- N10 IMM-->
         <match key="usb.product_id" int="0x1011">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -298,8 +315,8 @@
         </match>
         <!-- H10 20GB MTP-->
         <match key="usb.product_id" int="0x2101">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -309,8 +326,8 @@
         </match>
         <!-- H10 5GB MTP-->
         <match key="usb.product_id" int="0x2102">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -320,8 +337,8 @@
         </match>
         <!-- H10 5,6GB MTP-->
         <match key="usb.product_id" int="0x2105">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -333,8 +350,8 @@
       <match key="usb.vendor_id" int="0x1006">
 	<!-- iDP 100 UMS-->
 	<match key="usb.product_id" int="0x0001">
-          <merge key="info.category" type="string">portable_audio_player</merge>
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.type" type="string">generic</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>