hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree a109a73038ee5b153f69d9d3fdce06668e77b6e6 (from aa5e5b760f28b6e662b8b10137c19bc39a59ef49)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Apr 16 14:14:23 2007 +0200

    added SanDisk Sansa c250 to list of USB MP3 player
    
    Added new entry for SanDisk Sansa c250 as USB MP3 Player. Used and reworked/
    extended patch from Duane S. Bone <duane_bone at hotmail.com> (see fd.o bug
    10622) due to product information.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 4a68792..bbca407 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -363,7 +363,7 @@
             <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.input_formats" type="strlist">audio/mpeg</append>
-           <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
           </match>
           <!-- Sansa e270 (maybe others as well) -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x7421">
@@ -373,6 +373,17 @@
             <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 c250 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x7451">
+	    <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/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="strlist">PLAYLIST/%File</append>
+	    <merge key="storage.requires_eject" type="bool">true</merge>
+          </match>
 	</match>
 
         <!-- Feiya Technology Corp Memory Bar -->