hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/10-usb-music-players.fdi |   19 +++++++++++++++++
 1 file changed, 19 insertions(+)

New commits:
commit d8992bf3bef000dbb74838b59c0470faaa9ad24e
Author: Malcolm <malcolm.parsons at gmail.com>
Date:   Sun Jun 28 22:09:25 2009 +0200

    add Samsung YP-P3 music player
    
    Reported on hal ML.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 681f5e3..d81fab3 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -321,6 +321,25 @@
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
 	    <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
 	  </match>
+	  <!-- Samsung Yepp YP-P3 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x5119">
+	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+	    <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.output_formats" type="strlist">audio/aac</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">image/jpeg</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">text/plain</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">application/x-shockwave-flash</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">video/x-ms-wmv</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Video/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Datacasts/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Recorded Files/FM Radio/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Recorded Files/Voice/</append>
+	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
+	  </match>
 	</match>
  	
 	<!-- Sony -->