hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit b5f329fd809dc88999e28d82b68ed914821a1ce7
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 6 18:46:21 2008 +0100

    added Cowon iAudio 7 music player
    
    Added a Cowon iAudio 7 music player reported from Brian D. White
    <felixruina at gmail.com> via:
    https://bugs.launchpad.net/ubuntu/+source/hal-info/+bug/173559..

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 1c308ef..3e34d6c 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -500,8 +500,8 @@
 	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
 	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
 	  </match>
-          <!-- iAudio F2 -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x710;0x730">
+          <!-- iAudio F2, iAudio 7 -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x710;0x730;0x750">
             <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">application/ogg</append>
@@ -509,11 +509,11 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+            <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
             <append key="portable_audio_player.audio_folders" type="strlist">MUSIC</append>
             <append key="portable_audio_player.audio_folders" type="strlist">VOICE</append>
             <append key="portable_audio_player.audio_folders" type="strlist">RECORD</append>
-            <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
-            <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
           </match>
 	</match>