hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Wed May 30 02:26:25 PDT 2007
fdi/information/10freedesktop/10-usb-music-players.fdi | 115 +++++++----------
1 files changed, 48 insertions(+), 67 deletions(-)
New commits:
diff-tree 7287d133a326d7c2c33567da36a015358d82e8a2 (from f02be8c9a0fdd37050dad7756f4457f70be60a50)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed May 30 11:23:39 2007 +0200
fix USB music player from commit 52407a01
Fixed bugs from commit 52407a01:
- use originating_device instead of deprecated physical_device
- moved added entries to current structure of the FDI-file (avoid adding
several properties two times)
- moved the W810i/W300i (SonyEricsson) and the iAudio F2 (Cowon)
entries to the related manufacturer sections of the file.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index d74ec24..346eb6b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -17,6 +17,17 @@
<!-- USB Mass Storage devices that are music players -->
<match key="@storage.originating_device:info.subsystem" string="usb">
+ <!-- Transcend -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x402">
+ <!-- Transcend T.Sonic 520 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x5661">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+ </match>
+
<!-- Creative -->
<match key="@storage.originating_device:usb.vendor_id" int="0x41e">
<!-- MuVo NX -->
@@ -554,6 +565,21 @@
<append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
<append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
</match>
+ <!-- iAudio F2 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x730">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <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/flac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</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">VOICE</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORD</append>
+ <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
+ </match>
</match>
<!-- Archos -->
@@ -579,40 +605,17 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
- <!-- iAudio F2 -->
- <match key="@storage.physical_device:usb.product_id" int="0x730">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
+ <!-- Archos A404 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1300">
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <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/flac</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</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">VOICE</append>
- <append key="portable_audio_player.audio_folders" type="strlist">RECORD</append>
- <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="strlist">Playlist/</append>
</match>
- <!-- Archos A404 -->
- <match key="@storage.physical_device:usb.product_id" int="0x1300">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
- <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="strlist">Playlist/</append>
- </match>
</match>
<!-- Sony Ericsson -->
@@ -650,6 +653,21 @@
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
</match>
+
+ <!-- Sony Ericsson W810i -->
+ <match key="@storage.originating_device:usb.product_id" int="0xe042">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+
+ <!-- Sony Ericsson W300i -->
+ <match key="@storage.originating_device:usb.product_id" int="0xe053">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+
</match>
<match key="@storage.originating_device:usb.vendor_id" int="0x1006">
@@ -708,28 +726,6 @@
<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>
-
- <!-- Sony Ericsson W810i) -->
- <match key="@storage.physical_device:usb.product_id" int="0xe042">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- </match>
-
- <!-- Sony Ericsson W300i -->
- <match key="@storage.physical_device:usb.product_id" int="0xe053">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- </match>
</match>
@@ -904,21 +900,6 @@
</match>
</match>
-
- <!-- Transcend -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x402">
- <!-- Transcend T.Sonic 520 -->
- <match key="@storage.physical_device:usb.product_id" int="0x5661">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- </match>
- </match>
</match>
<!-- USB devices that are music players but uses a user-space library -->
More information about the hal-commit
mailing list