hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 98b34973933fc6db1735ae94053ed369826226f7 (from a949ee5340b3037d1e480718ff3336c8b439930b)
Author: Elias Probst <elias.probst at gmx.de>
Date:   Wed Mar 7 15:21:15 2007 +0100

    added iRiver T20 to USB musicplayers
    
    Added iRiver T20 to USB musicplayers list.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9b94bb5..338702a 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -673,6 +673,14 @@
 
 	<!-- iRiver -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x4102">
+	  <!-- T20 UMS -->
+          <match key="@storage.originating_device:usb.product_id" int="0x1014">
+            <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>
+          </match>
 	  <!-- T30 UMS -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x1018">
             <merge key="portable_audio_player.type" type="string">generic</merge>