hal: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
commit 8d93383c57c75885e584f38e228a5352ddef0f40
Author: Bastien Nocera <hadess at hadess.net>
Date:   Mon Mar 3 15:45:34 2008 +0100

    added Sony Ericsson K850i to USB mp3 players
    
    Added Sony Ericsson K850i to USB mp3 players. The supported formats
    list was taken from the "default-capability.xml" file on the phone's
    internal memory card.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 340a52e..ef778f6 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -553,7 +553,7 @@
              <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
              <append key="portable_audio_player.output_formats" type="strlist">audio/AMR</append>
              <append key="portable_audio_player.input_formats" type="strlist">audio/AMR</append>
-           </match>
+          </match>
 
 	  <!-- W810i, K610i, W300i -->
 	  <match key="@storage.originating_device:usb.product_id" int_outof="0xe042;0xe046;0xe053">
@@ -604,6 +604,24 @@
 	    <append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
 	  </match>
 
+	  <!-- Sony Ericsson K850i -->
+          <match key="@storage.originating_device:usb.product_id" int="0xe075">
+             <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/aac</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+	     <append key="portable_audio_player.output_formats" type="strlist">audio/AMR</append>
+	     <append key="portable_audio_player.output_formats" type="strlist">audio/AMR-WB</append>
+	     <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.m-realaudio</append>
+	     <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+	     <append key="portable_audio_player.output_formats" type="strlist">audio/x-m4b</append>
+	     <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+	     <append key="portable_audio_player.output_formats" type="strlist">audio/midi</append>
+	     <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+             <append key="portable_audio_player.input_formats" type="strlist">audio/AMR</append>
+             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+          </match>
+
 	</match>
 
  	<!-- LG Fusic Phone -->
commit dd607c8063ffead662e6a4dc3798d89bdeada157
Author: Oliver Gerlich <oliver.gerlich at gmx.de>
Date:   Mon Mar 3 15:39:08 2008 +0100

    added Mobile Media Tech no-name music player
    
    Added Mobile Media Tech no-name music player (no-name USB music player
    sold as 'Lavod', according to the USB database, the vendor ID is
    'Mobile Media Tech.'). Contributed via: https://bugs.launchpad.net/bugs/114443

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index fe2a4e6..340a52e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -647,6 +647,16 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	</match>
+        
+	<!-- Mobile Media Tech. -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0x1011">
+          <!-- No-name device, sold as "Lavod" -->
+          <match key="@storage.originating_device:usb.product_id" int="0x0001">
+            <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.input_formats" type="strlist">audio/x-wav</append>
+          </match>
+        </match>
 
 	<!-- TouchStone/WaveX -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x10c7">