hal: Branch 'origin'

[David Zeuthen]

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

New commits:
diff-tree 52407a01c05d18211c6097fac4aae710d14302f5 (from 7592fe18b339a879b82e2a34438f966eaec1da65)
Author: Martin Pitt <martin at piware.de>
Date:   Wed May 23 13:51:44 2007 -0400

    some more USB music players
    
    Attached is a patch against hal-info for some more USB music players,
    contributed by various Ubuntu community members.
    
    The patch also fixes the directory attribute for the TouchStone/WaveX.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 02fd962..7d22983 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -569,6 +569,40 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
           </match>
+          <!-- iAudio F2 -->
+          <match key="@storage.physical_device:usb.product_id" int="0x730">
+            <append key="info.capabilities" type="strlist">portable_audio_player</append>
+            <merge key="info.category" type="string">portable_audio_player</merge>
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+            <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/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/mpeg</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">MUSIC</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">VOICE</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">PLAYLIST/%File</append>
+          </match>
+          <!-- Archos A404 -->
+           <match key="@storage.physical_device:usb.product_id" int="0x1300">
+             <append key="info.capabilities" type="strlist">portable_audio_player</append>
+             <merge key="info.category" type="string">portable_audio_player</merge>
+             <merge key="portable_audio_player.type" type="string">generic</merge>
+             <merge key="portable_audio_player.access_method" type="string">storage</merge>
+             <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</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/x-wav</append>
+             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+             <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+             <append key="portable_audio_player.playlist_path" type="strlist">Playlist/</append>
+           </match>
         </match>
 
 	<!-- Sony Ericsson -->
@@ -649,6 +683,7 @@
 	    <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>
+            <append key="portable_audio_player.audio_folders" type="strlist">MP3/</append>
 	  </match>
 	</match>
      
@@ -663,6 +698,29 @@
 	    <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>
 	  </match>
+
+          <!-- Sony Ericsson W810i) -->
+          <match key="@storage.physical_device:usb.product_id" int="0xe042">
+            <append key="info.capabilities" type="strlist">portable_audio_player</append>
+            <merge key="info.category" type="string">portable_audio_player</merge>
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+          </match>
+
+          <!-- Sony Ericsson W300i -->
+          <match key="@storage.physical_device:usb.product_id" int="0xe053">
+            <append key="info.capabilities" type="strlist">portable_audio_player</append>
+            <merge key="info.category" type="string">portable_audio_player</merge>
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+          </match>
+   
 	</match>
 
         <!-- Jens of Sweden -->
@@ -837,6 +895,20 @@
 
       </match>
 
+      <!-- Transcend -->
+      <match key="@storage.physical_device:usb.vendor_id" int="0x402">
+        <!-- Transcend T.Sonic 520 -->
+        <match key="@storage.physical_device:usb.product_id" int="0x5661">
+        <append key="info.capabilities" type="strlist">portable_audio_player</append>
+        <merge key="info.category" type="string">portable_audio_player</merge>
+        <merge key="portable_audio_player.type" type="string">generic</merge>
+        <merge key="portable_audio_player.access_method" type="string">storage</merge>
+        <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+        <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</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/x-wav</append>
+        </match>
+      </match>
     </match>      
 
     <!-- USB devices that are music players but uses a user-space library -->