hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 14146442b12d5718a60d3ca1d5fe662376cab0b8
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Feb 12 17:11:15 2009 +0100

    add a iRiver S10 UMS as USB music player
    
    Added a iRiver S10 UMS as USB music player as reported by
    Giulio Fidente <giulivo.navigante at gmail.com> via fd.o#20016.
    Adapted proposed patch to current git.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index f1f9010..a641599 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -909,14 +909,19 @@
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
-	  <!-- T30 UMS firmware v1.7 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x1019">
+	  <!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1019;0x1023">
             <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">application/ogg</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
 	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
+	    <!-- S10 UMS firmware v1.05 folder -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x1023">
+              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
+            </match>
           </match>
           <!-- iFP 100 UMS, 300 UMS, 500 UMS (supports application/ogg only after firmware upgrade),
                N10 UMS