hal-info: Branch 'master' - 2 commits

[Martin Pitt]

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

New commits:
commit bffde4e9b8e668b2db6778fa4dae7ab35a8b9d22
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Jun 17 15:00:00 2008 +0200

    Add Lyra TH1100A music player.
    
    Taken from https://launchpad.net/bugs/213636, thanks to Edward Amsden!
    (No public author email address available)

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index c835907..d944573 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -376,6 +376,11 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
           </match>
+          <!-- Lyra TH1100A -->
+          <match key="@storage.originating_device:usb.product_id" int="0x778">
+           <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+           <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>         
 	</match>
 
 	<!-- SanDisk -->
commit f77c1ba3fae858a8f8fbfab49fb9d49a675f0f1f
Author: Mihai Ile <mihai.ile at gmail.com>
Date:   Tue Jun 17 14:59:40 2008 +0200

    Add Sony Walkman NWD-B105 music player.
    
    Taken from https://launchpad.net/bugs/231470

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 2bbd1c8..c835907 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -274,6 +274,16 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
+          <!-- Sony Walkman NWD-B105 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x317">
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+            <append key="portable_audio_player.input_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">Record/Voice/</append>
+            <append key="portable_audio_player.playlist_format" type="strlist"></append>
+            <append key="portable_audio_player.playlist_path" type="string"></append>
+          </match>
 	</match>
 
 	<!-- LG Fusic Phone -->