hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit 6d3dd857c7f7481d894dbad6e00da7b64eec2dcf
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Thu Feb 12 21:34:06 2009 +0100

    merge the Sandisk Sansa music players
    
    One had a reportedly wrong AAC capability, and both use the same chip,
    so unify them into one record.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index a641599..ccd59d6 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -452,10 +452,13 @@
             <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">
+          <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>
@@ -491,18 +494,6 @@
 	    <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
 	    <merge key="storage.requires_eject" type="bool">true</merge>
           </match>
-	  <!-- Sansa Fuze -->
-	  <match key="@storage.originating_device:usb.product_id" int="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/aac</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.audio_folders" type="strlist">MUSIC/</append>
-            <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
-            <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-            <merge key="storage.requires_eject" type="bool">true</merge> 
-	  </match>
 	</match>
 
         <!-- Olympus -->