hal/fdi/information/10freedesktop 10-usb-music-players.fdi, 1.10, 1.11

[Danny Kukawka]

Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory gabe:/tmp/cvs-serv4064/fdi/information/10freedesktop

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

        * fdi/information/10freedesktop/10-usb-music-players.fdi: added
        slightly tweaked patch from fd.o bug #5652 (from Jonathan Matthew
        <jonathan at kaolin.hn.org>)



Index: 10-usb-music-players.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-music-players.fdi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- 10-usb-music-players.fdi	3 Feb 2006 17:31:39 -0000	1.10
+++ 10-usb-music-players.fdi	4 Feb 2006 17:27:35 -0000	1.11
@@ -66,7 +66,20 @@
           </match>
         </match>
 
+	<!-- iRiver -->
 	<match key="@storage.physical_device:usb.vendor_id" int="0x4102">
+	  <!-- T30 UMS -->
+	  <match key="@storage.physical_device:usb.product_id" int="0x1018">
+            <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">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>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+          </match>
           <!-- 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>