hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit ab0bb7cf3eea5cf167776efae4e3741e0c2a4d90
Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
Date:   Tue Oct 28 09:19:51 2008 +0100

    add HTC G1 music player (Android phone)
    
    Add HTC G1 music player (Android phone), as reported by Sandy
    Armstrong on the upstream ML.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 1e5741b..e3b3604 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -899,6 +899,23 @@
           </match>
 	</match>
 
+        <!-- High Tech Computer Corp. -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0xbb4">
+          <!-- Android Phone -->
+          <match key="@storage.originating_device:usb.product_id" int="0xc01">
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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/3gpp</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</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>
+        </match>
+
       </match>
     </match>