hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-card-readers.fdi  |    5 ----
 fdi/information/10freedesktop/10-usb-music-players.fdi |   18 +++++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 59ea493617d01ab335443aa51c3ddb461c74e8c8
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 23 15:12:42 2010 +0200

    add another sd_mmc card
    
    Added adopted version of a patch from WangLi <iec23801 at gmail.com>
    (from HAL ML) to add another sd_mmc card reader theme. Merged some
    already existing matches.

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 166410d..e5ae051 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -47,10 +47,7 @@
       <match key="storage.model" contains="Storage-SMC">
         <merge key="storage.drive_type" type="string">smart_media</merge>
       </match>
-      <match key="storage.model" contains="Storage-MMC">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>
-      <match key="storage.model" contains="Storage-SDC">
+      <match key="storage.model" contains_outof="Storage-MMC;Storage-SDC;Multi-Card">
         <merge key="storage.drive_type" type="string">sd_mmc</merge>
       </match>
 
commit 79c659ab0919ca316ee1488f1f958277bd571598
Author: Andrew Williams <andy at tensixtyone.com>
Date:   Mon Aug 23 15:00:16 2010 +0200

    add Dell Streak as USB music player
    
    Added Dell Streak as USB music player.
    fd.o#29516/ubuntu#597653

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9b908d5..8b326f5 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -624,6 +624,7 @@
              <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
           </match>
+
 	  <!-- Windows Mobile PPC HTC Touch HD -->
           <match key="@storage.originating_device:usb.product_id" int="0xc25">
              <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
@@ -1210,6 +1211,23 @@
           </match>
 	</match>
 
+        <!-- Dell Computer Corp. -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0x413c">
+          <!-- Android Phone, Dell Streak -->
+          <match key="@storage.originating_device:usb.product_id" int="0xb007">
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+          </match>
+        </match>
+
       </match>
     </match>