hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit f992f8fd3b72845739d86af780e04e2a034d05b3
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Apr 3 22:12:25 2008 +0200

    fixed entry for the Sony Ericsson K320i phone
    
    Fixed entry for the Sony Ericsson K320i phone. Moved it to the correct
    place to have them in order and adopted the entry to the new file
    structure and the new keys.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 19155b0..dccf04f 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -571,6 +571,16 @@
 	    <append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
 	  </match>
 
+          <!-- Sony Ericsson K320i -->
+          <match key="@storage.originating_device:usb.product_id" int="0xe072">
+	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/AMR</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/midi</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/AMR</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">AUDIO/</append>
+          </match>
+
 	  <!-- Sony Ericsson K850i -->
           <match key="@storage.originating_device:usb.product_id" int="0xe075">
              <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
@@ -588,16 +598,6 @@
              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
           </match>
 
-          <!-- Sony Ericsson K320i -->
-          <match key="@storage.originating_device:usb.product_id" int="0xe072">
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/AMR</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/midi</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/AMR</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">AUDIO/</append>
-          </match>
-
 	</match>
 
  	<!-- LG Fusic Phone -->