hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 608feee169df4e83cbad97092cde7b9422ca7f20
Author: Stephane Loeuillet <leroutier at gmail.com>
Date:   Tue Apr 15 12:11:17 2008 +0200

    added Creative Zen Stone Plus as USB mp3 player
    
    Added Creative Zen Stone Plus as USB mp3 player.
    from https://bugs.freedesktop.org/show_bug.cgi?id=15440

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index dccf04f..22bf54c 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -61,6 +61,17 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+            <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>
+            <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+          </match>
+          <!-- Zen Stone Plus -->
+          <match key="@storage.originating_device:usb.product_id" int="0x4155">
+            <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/x-wav</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</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>
           </match>