hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit d19b5591cb49342e0fda1e7790231c2d0c48fa5c
Author: Alex Kanavin <ak at sensi.org>
Date:   Sun Feb 1 22:14:18 2009 +0100

    consolidate Nokia S60 phones music players
    
    consolidate all Nokia S60 based music players into a single hal rule.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index ebe0e70..9f29f8c 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -82,9 +82,20 @@
             <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>
           </match>
-          <!-- Nokia E60, E70 -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x0433;0x0434">
+  	  <!-- Nokia Series 60 phones -->
+          <match key="storage.model" string="S60">
             <merge key="storage.requires_eject" type="bool">true</merge>
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+            <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.audio_folders" type="strlist">Music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Music Downloads/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Sounds/Digital/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Sounds/Simple/</append>
+            <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+            <append key="portable_audio_player.playlist_path" type="strlist">Playlists/%File</append>
           </match>
           <!-- Nokia 5300 -->
           <match key="@storage.originating_device:usb.product_id" int="0x4b9">
@@ -109,14 +120,6 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
             <append key="portable_audio_player.audio_folders" type="strlist">music/</append>
           </match>
-          <!-- Nokia N82 -->
-          <match key="@storage.originating_device:usb.product_id" int="0x72">
-            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
-            <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.audio_folders" type="strlist">Sounds/Digital/</append>
-          </match>
         </match>
 
         <!-- MPIO HD300 Player -->