hal: Branch 'master'

[Sjoerd Simons]

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

New commits:
commit 5ded67145a87c4bc89f4d4554ddf16f859ac0f93
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Mon Nov 19 11:43:21 2007 +0100

    add Sony Ericsson K810i to music players
    
    Added the Sony Ericsson K810i as a music player as reported by Tomaz Solc

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index d16f8d7..fb83db0 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -491,6 +491,17 @@
 	    <append key="portable_audio_player.audio_folders" type="strlist">MSSEMC/Media files/audio/</append>
 	  </match>
 
+          <!-- Sony Ericsson K810i -->
+          <match key="@storage.originating_device:usb.product_id" int="0xe0a1">
+             <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.audio_folders" type="strlist">music/</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/AMR</append>
+             <append key="portable_audio_player.input_formats" type="strlist">audio/AMR</append>
+           </match>
+
 	  <!-- W810i, K610i, W300i -->
 	  <match key="@storage.originating_device:usb.product_id" int_outof="0xe042;0xe046;0xe053">
 	    <merge key="portable_audio_player.type" type="string">generic</merge>