hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit e5d3a4ffff5107b6e6acfe967c9d80cc4c73a5ee
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Oct 7 21:03:14 2008 +0200

    add iRiver E100 music player
    
    Add iRiver E100 music player, as reported by David Hilbig (no public
    email address) in https://launchpad.net/bugs/261685

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 55194cf..86ba4fa 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -861,6 +861,18 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
+	  <!-- E100 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x1041">
+            <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">application/ogg</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
+	    <append key="portable_audio_player.playlist_path" type="strlist">Playlists/%File</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
+          </match>
 	</match>
 
       </match>