hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 6486e66894b3238ae37ac355c1a13132b1fb9aff
Author: Eetu Huisman <eh at iki.fi>
Date:   Thu Mar 6 18:52:01 2008 +0100

    added TrekStor Blaxx music player
    
    Added TrekStor Blaxx music player, contributed via:
    https://launchpad.net/bugs/175411

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 3e34d6c..a09d074 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -753,7 +753,7 @@
           </match>
         </match>
 
-        <!-- Maxfield, M-Cody -->
+        <!-- Maxfield, M-Cody, TrekStor -->
         <match key="@storage.originating_device:usb.vendor_id" int="0x1890">
   	  <!-- M-Cody M20 -->
           <match key="@storage.originating_device:usb.product_id" int="0x0001">
@@ -774,6 +774,21 @@
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
           </match>
+          <!-- TrekStor (i.Beat) Blaxx -->
+          <match key="@storage.originating_device:usb.product_id" int="0x210">
+            <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">video/x-smv</append>
+            <append key="portable_audio_player.input_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">FM/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">LINE-IN/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+          </match>
         </match>
 
         <!-- Motorola -->