hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 8fac27849097ccf6df5b06d8888d8b13c110e917
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 23 23:34:01 2008 -0700

    fix new entry from b6d3ed743f58eff42c0dbdcbf8e7598a589e1584
    
    Fixed new Sony Walkman entry from b6d3ed743f58eff42c0dbdcbf8e7598a589e1584:
    - use only append for portable_audio_player.output_formats
    - don't add empty portable_audio_player.input_formats entries
    - don't set info.category in an entry, this gets add at the end of the file
    - don't set audio/mpeg for output_formats, this get added already for all
      USB mp3 player by default
    - don't set info.product and info.vendor

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7cc3420..231d7c1 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -297,15 +297,10 @@
           </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/aac</addset>
             <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>