hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 79cf7ab4aa87605e7b92b98691c447c9d83efd55
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Feb 26 14:21:57 2008 +0100

    fixed entry for Sansa Clip
    
    Fixed entry for Sansa Clip: please sort the added devices next time
    after the produc id, don't add *.output_formats=audio/mpeg - all mp3
    player get this format automatically.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 037f5f5..36aae1f 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -373,6 +373,16 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+	  <!-- Sansa Clip -->
+          <match key="@storage.originating_device:usb.product_id" int="0x7432">
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <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.audio_folders" type="strlist">MUSIC/</append>
+            <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+            <merge key="storage.requires_eject" type="bool">true</merge>
+          </match>
 	  <!-- Sansa c250 -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x7451">
 	    <merge key="portable_audio_player.type" type="string">generic</merge>
@@ -384,17 +394,6 @@
 	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
 	    <merge key="storage.requires_eject" type="bool">true</merge>
           </match>
-	  <!-- Sansa Clip -->
-          <match key="@storage.originating_device:usb.product_id" int="0x7432">
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-            <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
-            <merge key="storage.requires_eject" type="bool">true</merge>
-          </match>
 	</match>
 
 	<!-- Peak Digital Audio Player -->