hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit f7e42348fc9d9eed5dafdc6f86ec0ce9a07f8f6f
Author: James Henstridge <james at jamesh.id.au>
Date:   Tue Mar 24 09:30:53 2009 +0100

    merge the rules for "SanDisk Clip/Fuze" and "SanDisk Clip Version II"
    
    With recent firmware, the version 1 devices support the same list of
    formats.  Also add USB product IDs for the SanDisk Fuze version 2 from
    http://ubuntuforums.org/archive/index.php/t-1041356.html.
    
    bz#20616

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 8148e9e..f2f25f6 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -458,20 +458,10 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
           </match>
-	  <!-- Sansa Clip/Fuze -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x7432;0x7433;0x74c0;0x74c1">
-            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-            <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
-            <merge key="storage.requires_eject" type="bool">true</merge>
-          </match>
-	  <!-- Sansa Clip version II -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x7434;0x7435">
+	  <!-- Sansa Clip and Fuze versions 1 and 2.
+               Older devices require a firmware upgrade to support all
+               output formats, but we can't detect that via USB ID. -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x7432;0x7433;0x7434;0x7435;0x74c0;0x74c1;0x74c2;0x74c3">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>