hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 9e0a6418400797bfa8851bbd25f86f2dc4124121 (from 823a4d9ef45841257aac1710e8c6ca8610c68f69)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Apr 11 21:48:51 2007 +0200

    added SonyEricsson W910i to USB musicplayer
    
    Added SonyEricsson W910i to USB musicplayer. Used, reworked and extended
    patch from Florian Meister <florian.meister at medienhaus.at> (see fd.o #10579)
    due to information from the usermanual of the mobile phone.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 1daf02f..1f94027 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -571,6 +571,20 @@
 	    <append key="portable_audio_player.audio_folders" type="strlist">MP3/</append>
 	    <append key="portable_audio_player.audio_folders" type="strlist">MSSEMC/Media files/audio/</append>
 	  </match>
+
+	  <!-- W950i mobile phone -->
+	  <match key="@storage.originating_device:usb.product_id" int="0xd037">
+	    <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/aac</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/aac</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+	    <append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
+	  </match>
 	</match>
 
 	<match key="@storage.originating_device:usb.vendor_id" int="0x1006">