hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree f5b9163235e8539ba0645eff4a31a5d6534cd8bc (from 004d59ead4d2cc0217ff4c48ffae382d5fb95011)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 6 15:09:53 2007 +0200

    added support for Sony Ericsson K610i as mp3 player
    
    Added adopted patch from Olivier Berger <oberger at ouvaton.org> (fd.o #11221)
    to support Sony Ericsson K610i as USB mp3 player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index e93f1d5..73d3ec8 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -673,6 +673,13 @@
 	    <append key="portable_audio_player.audio_folders" type="strlist">MSSEMC/Media files/audio/</append>
 	  </match>
 
+	  <!-- K610i mobile phone -->
+	  <match key="@storage.originating_device:usb.product_id" int="0xe046">
+	    <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.input_formats" type="strlist">audio/x-wav</append>
+	  </match>
+
 	  <!-- W800 Walkman Phone -->
 	  <!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
 	  <match key="@storage.originating_device:usb.product_id" int="0xd028">