hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 1a2b66320a78344f7ebb089e91d1278ede99c830
Author: Benjamin Delagoutte <benjamin.delagoutte at laposte.net>
Date:   Tue Mar 4 16:32:23 2008 +0100

    added Sony Ericsson W880i to USB mp3 musicplayers
    
    Added Sony Ericsson W880i to USB mp3 musicplayers. Contributed via
    https://bugs.launchpad.net/ubuntu/+source/hal/+bug/117809 and fd.o
    bug #12969.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index b413773..c968d62 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -604,6 +604,16 @@
 	    <append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
 	  </match>
 
+	  <!-- W880i Walkman Phone -->
+	  <match key="@storage.originating_device:usb.product_id" int="0xe068">
+	    <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.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>
+
 	  <!-- Sony Ericsson K850i -->
           <match key="@storage.originating_device:usb.product_id" int="0xe075">
              <merge key="portable_audio_player.type" type="string">generic</merge>