hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 4f19e75e750ab2b1f379e6cd9f8625484cf0fa86
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Nov 12 20:52:59 2007 +0100

    added Meizu M6 MiniPlayer from fd.o 12970
    
    Added reworked and fixed patch with entry for a Meizu M6 MiniPlayer from
    fd.o bug 12970 reported by Stephane Loeuillet <leroutier at gmail.com>.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index e63eedf..9c2ef94 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -209,6 +209,20 @@
 	    <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>	
+	  <!-- Meizu M6 MiniPlayer -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x5a0f">
+	    <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/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/x-wav</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>
  
 	<!-- Sony -->