hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 524fac6e193cb69e596be25755ed4fc907c0d15f (from 7fe452a469d29b55d0378a3d6d7e01563ca804d1)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Aug 28 22:41:31 2007 +0200

    add entry for Sony Ericsson K800i to USB music player
    
    Added adopted and cleaned-up patch from fd.o bug #11835
    (posted by Per Thomas Jahr <perja at ifi.uio.no>) to add the
    Sony Ericsson K800i to the list of USB music player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 4ed3ac1..a27aa70 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -482,6 +482,24 @@
 	    <append key="portable_audio_player.audio_folders" type="strlist">MSSEMC/Media files/audio/</append>
 	  </match>
 
+	  <!-- K800i mobile phone -->
+	  <!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
+	  <match key="@storage.originating_device:usb.product_id" int="0xd039">
+	    <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/3gpp</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-amr</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-imy</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</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/x-wav</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-amr</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>