hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit 74524ae5f9ea3923c9997fb078d182c637a52707
Author: Mihai Ile <mihai.ile at gmail.com>
Date:   Mon Nov 24 11:07:23 2008 +0100

    add Sony Walkman NWZ-135F music player
    
    Add Sony Walkman NWZ-135F music player, as reported in
    https://launchpad.net/bugs/289161.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 55920ee..7827437 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -309,6 +309,12 @@
             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
             <append key="portable_audio_player.audio_folders" type="strlist">Record/Voice/</append>
           </match>
+          <!-- Sony Walkman NWZ-135F -->
+          <match key="@storage.originating_device:usb.product_id" int="0x36e">
+            <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.input_formats" type="strlist">audio/mpeg</append>
+          </match>
           <!-- Sony Walkman Video MP3 NWZ-xxxx -->
           <match key="@storage.originating_device:usb.product_id" int_outof="0x035b;0x035c">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>