hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 39e1426d05f3907cd1f8973098a521ab2a6484cc (from 5738b123c73897d7db74f5432d1f22302c19538d)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jun 1 00:22:32 2007 +0200

    added Lyra MC2021C USB MP3-Player
    
    Added adopted patch from Brian J. Murrell <brian at interlinx.bc.ca> from
    fd.o bug #11048 for Lyra MC2021C MP3-Player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 2fd141e..fb7cfcb 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -374,6 +374,15 @@
 	    <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>
 	  </match>
+          <!-- Lyra MC2021C -->
+          <match key="@storage.originating_device:usb.product_id" int="0x767">
+            <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/audible</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>
+          </match>
 	</match>
 
 	<!-- SanDisk -->