hal: Branch 'master'

[Richard Hughes]

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

New commits:
commit 9340393a7975898b85be79460881008f1c1020bf
Author: John A. Hull <john at racuza.com>
Date:   Tue Feb 19 14:02:11 2008 +0000

    add Sansa clip info for USB music players
    
    Attached is a patch to add Sansa clip info for USB music players. I have tested
    it on my new Sansa Clip and it seems to work well with Rhythmbox and Banshee.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 67539df..037f5f5 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -384,6 +384,17 @@
 	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
 	    <merge key="storage.requires_eject" type="bool">true</merge>
           </match>
+	  <!-- Sansa Clip -->
+          <match key="@storage.originating_device:usb.product_id" int="0x7432">
+            <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/x-ms-wma</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+            <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+            <merge key="storage.requires_eject" type="bool">true</merge>
+          </match>
 	</match>
 
 	<!-- Peak Digital Audio Player -->