hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |   30 +++++++++++++----
 1 files changed, 23 insertions(+), 7 deletions(-)

New commits:
diff-tree bee8fe6927340b0a37bd93dbe295c82f7851ef7e (from 54be9fb333bab23b5ce6a7473fb469ddd2ccc8b1)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Feb 21 10:49:21 2007 +0100

    added entry for Cowon iAUDIO U2 USB mp3 player
    
    Added slightly adopted patch from Chris Mayo <chris at mayo.clara.co.uk>
    to add the Cowon iAUDIO U2 USB mp3 player (fd.o bug #9187).
    
    Fixed some entries to respect spec for portable_audio_player.audio_folders.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 2240c41..e5c8a25 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -474,6 +474,23 @@
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
 	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
 	  </match>
+	  <!-- iAudio U2 -->
+	  <match key="@storage.physical_device:usb.product_id" int="0x600">
+	    <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/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">RECORDS/FM/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
+	  </match>
 	  <!-- iAudio G3 -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x601">
 	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
@@ -532,15 +549,14 @@
 	    <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>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE</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.audio_folders" type="strlist">RECORDS/FM/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
 	  </match>
 	</match>