hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 7543131963753acf28bd3ddebc54c0d15186dba2
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri May 23 16:40:59 2008 +0200

    cleanup/order entries
    
    Cleaned up/ordered the existing entries by vendor id.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 962c046..a518c08 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -265,7 +265,7 @@
 	    <append key="portable_audio_player.playlist_path" type="string">PLAYLISTS/%File</append>
 	  </match>
 	</match>
- 
+ 	
 	<!-- Sony -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x54c">
           <!-- Sony Network Walkman -->
@@ -275,6 +275,19 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	</match>
+
+	<!-- LG Fusic Phone -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0x05c6">
+          <match key="@storage.originating_device:usb.product_id" int="0x1000">
+            <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/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>
+            <addset key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</addset>
+          </match>
+        </match>
 	
 	<!-- Jetflash MP3 Player, AKA NAPA LCD-HD, AKA Medion, AKA Tevion  and other -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x066f">
@@ -393,6 +406,15 @@
           </match>
 	</match>
 
+        <!-- Olympus -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0x07b4">
+          <!-- DS-2 voice recorder -->
+          <match key="@storage.originating_device:usb.product_id" int="0x020e">
+            <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>
+          </match>
+        </match>
+
 	<!-- Peak Digital Audio Player -->
         <match key="@storage.originating_device:usb.vendor_id" int="0xd7d">
           <match key="@storage.originating_device:usb.product_id" int="0x1651">
@@ -614,31 +636,8 @@
              <append key="portable_audio_player.input_formats" type="strlist">audio/amr</append>
              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
           </match>
-
 	</match>
 
- 	<!-- LG Fusic Phone -->
-        <match key="@storage.originating_device:usb.vendor_id" int="0x05c6">
-          <match key="@storage.originating_device:usb.product_id" int="0x1000">
-            <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/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>
-            <addset key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</addset>
-          </match>
-        </match>
- 
-        <!-- Olympus -->
-        <match key="@storage.originating_device:usb.vendor_id" int="0x07b4">
-          <!-- DS-2 voice recorder -->
-          <match key="@storage.originating_device:usb.product_id" int="0x020e">
-            <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>
-          </match>
-        </match>
-
 	<match key="@storage.originating_device:usb.vendor_id" int="0x1006">
           <!-- iGP 100 -->
           <match key="@storage.originating_device:usb.product_id" int="0x2001">