hal/fdi/information/10freedesktop 10-usb-music-players.fdi, 1.14, 1.15

[Danny Kukawka]

Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory kemper:/tmp/cvs-serv8615/fdi/information/10freedesktop

Modified Files:
	10-usb-music-players.fdi 
Log Message:
2006-04-12  Danny Kukawka  <danny.kukawka at web.de>

        * fdi/information/10freedesktop/10-usb-music-players.fdi: Applied
        slightly adopted patches from fd.o bugs 6317, 6462, 6464, 6561.
        Reorganized the listed devices ordered my the vendor id and removed
        double vendor matches.



Index: 10-usb-music-players.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-music-players.fdi,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- 10-usb-music-players.fdi	13 Mar 2006 18:18:35 -0000	1.14
+++ 10-usb-music-players.fdi	12 Apr 2006 21:23:59 -0000	1.15
@@ -34,35 +34,34 @@
       <!-- USB Mass Storage devices that are music players -->
       
       <match key="@storage.physical_device:info.bus" string="usb">
-	<!-- Sony -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x54c">
-          <!-- Sony Network Walkman -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1fb">
+        <!-- Creative -->
+	<match key="@storage.physical_device:usb.vendor_id" int="0x41e">
+	  <!-- MuVo NX -->
+	  <match key="@storage.physical_device:usb.product_id" int="0x4115">
[...999 lines suppressed...]
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	</match>
-        <!-- GMini XS202 -->
-        <match key="usb.product_id" int="0x1206">
-          <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>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-        </match>
-      </match>
-
     </match>
 
   </device>