hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree a8e3c5c97af7360348088c336cbef50563ea1b14 (from bee8fe6927340b0a37bd93dbe295c82f7851ef7e)
Author: Joseph Tennies <joe at fatnsoft.com>
Date:   Wed Feb 21 11:06:44 2007 +0100

    added support for Samsung YP-MT6V music player.
    
    Added support for Samsung YP-MT6V USB music player (slightly adopted).
    to close fd.o bug #8998.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index e5c8a25..6b66287 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -225,6 +225,19 @@
 	    <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>	
+	  <!-- Samsung YP-MT6V -->
+	  <match key="@storage.physical_device:usb.product_id" int="0x5026">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
+	    <merge key="info.category" type="string">portable_audio_player</merge>
+	    <merge key="portable_audio_player.type" type="string">generic</merge>
+	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
+	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+	    <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.output_formats" type="strlist">audio/x-wav</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+	  </match>
 	  <!-- YP-F1 -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x502b">
 	    <append key="info.capabilities" type="strlist">portable_audio_player</append>