hal/fdi/information/10freedesktop 10-usb-music-players.fdi,1.8,1.9

[Danny Kukawka]

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

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

        Fixed fd.o bug #5137 with slightly adopted and split off patch
        from James Henstridge <james at jamesh.id.au>

        * fdi/information/10freedesktop/10-usb-music-players.fdi: added
        Sony PSP to usb music players.

        * fdi/policy/10osvendor/10-storage-policy.fdi: added
        desired_mount_point for Sony PSP.



Index: 10-usb-music-players.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-music-players.fdi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- 10-usb-music-players.fdi	13 Jan 2006 17:08:24 -0000	1.8
+++ 10-usb-music-players.fdi	13 Jan 2006 17:35:07 -0000	1.9
@@ -18,6 +18,19 @@
 	</match>
       </match>
 
+      <!-- Sony PSP (PlayStation Portable) -->
+      <match key="storage.vendor" string="Sony">
+        <match key="storage.model" string="PSP">
+          <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <merge key="portable_audio_player.access_method" type="string">storage</merge>
+          <merge key="portable_audio_player.type" type="string">psp</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/vnd.sony.atrac3</append>
+          <merge key="storage.drive_type" type="string">memory_stick</merge>
+        </match>
+      </match>
+
       <!-- USB Mass Storage devices that are music players -->
       
       <match key="@storage.physical_device:info.bus" string="usb">