hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 82c808cacfbe4a04194b28e2bcaf0474173b1c93 (from a3d88893a5086926711c98df101a0a6981c2f46a)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 27 16:53:08 2007 +0200

    added T.sonic 610 (Transcend) USB MP3-Player
    
    Added adopted patch from David Olivier <dolivier at intraprise.co.za> from
    fd.o bug 10419 for T.sonic 610 (Transcend) MP3-Player to
    10-usb-music-players.fdi

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 6d9a13c..7363548 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -308,6 +308,13 @@
             <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>
+          <!--Transcend (T.Sonic 610) -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x82e0">
+	    <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.input_formats" type="strlist">audio/x-wav</append>
+	  </match>
 	  <!-- TrekStor i.Beat jump MP3 Player -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x835d">
 	    <merge key="portable_audio_player.type" type="string">generic</merge>