hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree bc910e84c24a999f844d10303642f73468483b57 (from fc0cb07cb3a754fe3603301c5bfe22be6187b186)
Author: Jonathan Matthew <jonathan at kaolin.wh9.net>
Date:   Mon Aug 6 13:30:06 2007 +0200

    added support for iRiver T30 UMS firmware v1.7
    
    From fd.o #11698:
    > Version 1.7 (or perhaps earlier) of the firmware for the iRiver T30
    > (USB mass storage version) changes the device ID from 0x1018 to 0x1019.
    > It also adds a new playlist format that I'm working on adding support
    > for, audio/x-iriver-pla.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 862e62d..298b1f2 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -845,6 +845,16 @@
             <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">
+            <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">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="strlist">Playlists/%File</append>
+          </match>
 	  <!-- T10 UMS -->
           <match key="@storage.originating_device:usb.product_id" int="0x1020">
             <merge key="portable_audio_player.type" type="string">generic</merge>