hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 08c0e75c7a4c732f9016ac686153e3f48113a6a4
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Apr 15 12:13:34 2008 +0200

    fixed some USB mp3 player entries
    
    Fixed some USB mp3 player entries: removed audio/mpeg values from
    portable_audio_player.output_formats since this get added at the end
    of the FDI file.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 22bf54c..8b87182 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -61,7 +61,6 @@
             <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>
@@ -70,7 +69,6 @@
             <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>
@@ -617,7 +615,6 @@
             <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <addset key="portable_audio_player.output_formats" type="strlist">audio/mpeg</addset>
             <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
             <addset key="portable_audio_player.audio_folders" type="strlist">MUSIC</addset>
             <append key="portable_audio_player.playlist_path" type="string">MUSIC/AllMyMusic.m3u</append>