hal: Branch 'master'

[Jeff Mitchell]

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

New commits:
diff-tree 4fa827c85bcc285272e42a0baa6ca4a36d642fb7 (from 51ac28987a6492e08acc446f7725c16e72b68560)
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date:   Tue Jun 12 10:52:59 2007 -0400

    Patch by Steven Walter <stevenrwalter at gmail.com> to add support for LG Fusic Phone.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index fb7cfcb..b16304e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -675,6 +675,20 @@
 
 	</match>
 
+ 	<!-- LG Fusic Phone -->
+        <match key="@storage.physical_device:usb.vendor_id" int="0x05c6">
+          <match key="@storage.physical_device:usb.product_id" int="0x1000">
+            <addset key="info.capabilities" type="strlist">portable_audio_player</adddset>
+            <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/mpeg</addset>
+            <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</adddset>
+            <addset key="portable_audio_player.audio_folders" type="strlist">MUSIC</adddset>
+            <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>
+ 
 	<match key="@storage.originating_device:usb.vendor_id" int="0x1006">
           <!-- iGP 100 -->
           <match key="@storage.originating_device:usb.product_id" int="0x2001">