hal: Branch 'master'

[Sjoerd Simons]

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

New commits:
commit faae7a59ac22acea2e5b124cbc0671ce8e41fa77
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sun Nov 18 21:11:52 2007 +0100

    add MPIO HD300 player
    
    Add MPIO HD300 as reported by Nicolas Évrard

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 801702d..ce155c0 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -87,6 +87,19 @@
           </match>
         </match>
 
+        <!-- MPIO HD300 Player -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0x05e3">
+          <match key="@storage.originating_device:usb.product_id" int="0x0702">
+            <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/mpeg</append>
+            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+            <append key="portable_audio_player.output_formats" type="strlist">video/x-ms-asf</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+          </match>
+        </match>
+
 	<!-- SONICblue -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x045a">
 	  <!-- Rio Forge -->