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

[Danny Kukawka]

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

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

        * fdi/information/10freedesktop/10-usb-music-players.fdi:
        applied slightly adopted patch and added new device from fd.o bugs:
        6169, 6228



Index: 10-usb-music-players.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-music-players.fdi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- 10-usb-music-players.fdi	8 Mar 2006 22:40:32 -0000	1.13
+++ 10-usb-music-players.fdi	13 Mar 2006 18:18:35 -0000	1.14
@@ -568,6 +568,22 @@
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
 	  </match>
 	</match>
+
+	<!-- Samsung -->
+	<match key="@storage.physical_device:usb.vendor_id" int="0x4e8">
+	  <!-- YP-F1 -->
+	  <match key="@storage.physical_device:usb.product_id" int="0x502b">
+	    <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>
+	</match>
  
 	<!-- RCA -->
 	<match key="@storage.physical_device:usb.vendor_id" int="0x69b">
@@ -603,6 +619,21 @@
 	  </match>
 	</match>
 
+	<!-- Archos -->
+	<match key="@storage.physical_device:usb.vendor_id" int="0xe79">
+	  <!-- Archos XS 100 -->
+          <match key="@storage.physical_device:usb.product_id" int="0x1205">
+	    <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.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+          </match>
+        </match>
+
 	<!-- Sony Ericsson -->
 	<match key="@storage.physical_device:usb.vendor_id" int="0xfce">
 	  <!-- K750i mobile phone -->