hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree ca0aee4be0475c3aba542d4c48217cc87545342b (from bc910e84c24a999f844d10303642f73468483b57)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 6 13:39:21 2007 +0200

    added Meizu Mini Player M6 audio player from fd.o #11735
    
    Added adopted patch from Michael Budde <mbudde at gmail.com> from fd.o #11735
    to add Meizu Mini Player M6 audio player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 298b1f2..2ab23a2 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -180,6 +180,24 @@
 	  </match>
         </match>
 
+	<!-- Meizu -->
+	<match key="@storage.originating_device:usb.vendor_id" int="0x492">
+          <!-- Mini Player M6 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x140">
+            <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">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">audio/flac</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+            <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+            <append key="portable_audio_player.playlist_path" type="string">PLAYLISTS/%File</append>
+          </match>
+        </match>
+
  	<!--Panasonic -->
         <match key="@storage.originating_deviceusb.vendor_id" int="0x4da">
 	  <!--Panasonic SV-MP31V-->