hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 42f9acbed2a934402b14ce4cf4b2ebb55f670559
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Sun Feb 1 11:39:06 2009 +0100

    removed not needed audio/mpeg from output_formats
    
    Removed not needed audio/mpeg from output_formats, the entry get
    added anyway for all mp3 players.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 29f8234..ebe0e70 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -96,7 +96,6 @@
           <match key="@storage.originating_device:usb.product_id" int="0x6a">
             <merge key="storage.model" type="string">5310</merge>
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <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.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
@@ -113,10 +112,10 @@
           <!-- Nokia N82 -->
           <match key="@storage.originating_device:usb.product_id" int="0x72">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <append key="portable_audio_player.audio_folders" type="strlist">Sounds/Digital/</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
             <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.audio_folders" type="strlist">Sounds/Digital/</append>
           </match>
         </match>