hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit b6d3ed743f58eff42c0dbdcbf8e7598a589e1584
Author: Ivan N. Zlatev <contact at i-nz.net>
Date:   Tue Sep 23 23:26:15 2008 -0700

    add entry for two Sony Walkman Video MP3 NWZ-xxxx models
    
    Added entry for two Sony Walkman Video MP3 NWZ-xxxx models.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index b912498..7cc3420 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -295,6 +295,19 @@
             <append key="portable_audio_player.playlist_format" type="strlist"></append>
             <append key="portable_audio_player.playlist_path" type="string"></append>
           </match>
+          <!-- Sony Walkman Video MP3 NWZ-xxxx -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x035b;0x035c">
+            <merge key="info.vendor" type="string">Sony</merge>
+            <merge key="info.product" type="string">Walkman Video MP3 Player</merge>
+            <merge key="info.category" type="string">portable_audio_player</merge>
+            <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>
+            <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
+            <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.input_formats" type="strlist"></append>
+            <append key="portable_audio_player.audio_folders" type="strlist">music/</append>
+          </match>
 	</match>
 
 	<!-- LG Fusic Phone -->