hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 8d8ef711a54e2664c7d086c43b3cc3ea9b28edd5 (from 785adba9f3725db46bc3decfbaeb7eb29c04a26f)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 11 20:22:24 2007 +0200

    added new entry for Samsung YP-T9
    
    Added new entry for a Samsung YP-T9 USB-mp3 player with *.*_formats info
    from the Samsung product info site. USB-id was reported via HAL ML from
    Andrey Fedoseev <andrey.fedoseev at gmail.com>.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 130e4ae..e63eedf 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -199,6 +199,16 @@
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-scpls</append>
 	    <append key="portable_audio_player.playlist_path" type="strlist">Playlists/</append>
           </match>  
+	  <!-- Samsung YP-T9  -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x5055">
+	    <merge key="portable_audio_player.type" type="string">generic</merge>
+	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
+	    <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-ms-asf</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</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>
  
 	<!-- Sony -->