hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit b68dffd36cbbcdb23b381ae7eb473bc75caddbce
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Oct 7 21:38:20 2008 +0200

    add Nokia 5310 music player
    
    Add Nokia 5310 music player, as reported by "Chris"
    <rawlinc at gmail.com> in https://launchpad.net/bugs/246741.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index e2fba96..077b9dc 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -92,6 +92,16 @@
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
           </match>
+          <!-- Nokia 5310 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x6a">
+            <merge key="storage.model" type="string">5310</merge>
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+            <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">Music/</append>
+          </match>
   	  <!-- Nokia 6300 -->
           <match key="@storage.originating_device:usb.product_id" int="0x4fa">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>