hal: Branch 'master'

[Danny Kukawka]

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

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

    added support for TrekStor Vibez mp3 player from fd.o #11736
    
    Added adopted patch from Sharmarke Aden <aden.list at gmail.com> from fd.o #11736
    to add support for TrekStor Vibez mp3 player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 2ab23a2..9efb2e8 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -371,6 +371,18 @@
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
 	  </match>
+          <!-- TrekStor vibez --> 
+          <match key="@storage.originating_device:usb.product_id" int="0x842a">
+	   <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/x-wav</append>
+	   <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>       
+	   <append key="portable_audio_player.playlist_format" type="strlist">audio/x-scpls</append>
+	   <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>           
+	   <append key="portable_audio_player.playlist_format" type="strlist">application/vnd.ms-wpl</append>
+	 </match>
         </match>
 
 	<!-- RCA -->