hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Wed Feb 21 08:22:18 PST 2007
fdi/information/10freedesktop/10-usb-music-players.fdi | 190 +++++++----------
1 files changed, 82 insertions(+), 108 deletions(-)
New commits:
diff-tree e02d63eb700f798f913f2af59fb5cb0e0b428464 (from eaceb3f57e8869deb3ab4b74da79e64782854194)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Feb 21 17:22:13 2007 +0100
cleaned up USB music players
Cleaned up the USB music player fdi-file part for storage devices. Removed
double entries and merged different player under the correct vendor to
reduce double checks. Sorted vendor sections by USB vendor ID.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 3aa4e59..ab40d2e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -183,6 +183,22 @@
</match>
</match>
+ <!-- Philips -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x471">
+ <!-- Philips GoGear SA1330 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x165">
+ <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.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+ </match>
+
<!--Panasonic -->
<match key="@storage.originating_deviceusb.vendor_id" int="0x4da">
<!--Panasonic SV-MP31V-->
@@ -450,8 +466,45 @@
<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>
+ <!-- Sansa m250 (maybe others as well) -->
+ <match key="@storage.originating_device:usb.product_id" int="0x7401">
+ <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/mpeg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+ </match>
+ <!-- Sansa e270 (maybe others as well) -->
+ <match key="@storage.originating_device:usb.product_id" int="0x7421">
+ <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/mpeg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+ </match>
</match>
+ <!-- Feiya Technology Corp Memory Bar -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x090c">
+ <match key="@storage.originating_device:usb.product_id" int="0x1000">
+ <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/mpeg</append>
+ </match>
+ </match>
+
<!-- Peak Digital Audio Player -->
<match key="@storage.originating_device:usb.vendor_id" int="0xd7d">
<match key="@storage.originating_device:usb.product_id" int="0x1651">
@@ -743,14 +796,15 @@
</match>
</match>
- <!-- Foston -->
+ <!-- Foston, MPMan -->
<match key="@storage.originating_device:usb.vendor_id" int="0x10d6">
- <!-- Foston 256MB -->
+ <!-- Foston 256MB / MPMan MP-Ki 128 Player -->
<match key="@storage.originating_device:usb.product_id" int="0x1100">
<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.folder_depth" type="int">0</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>
@@ -790,8 +844,34 @@
</match>
</match>
+ <!-- Nexia NX58XX (including Super*Talent MegaScreen) -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x1718">
+ <match key="@storage.originating_device:usb.product_id" int="0x1013">
+ <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/mpeg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+ </match>
+ </match>
+
<!-- Motorola -->
<match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
+ <!-- Motorola iTunes enabled phone -->
+ <match key="@storage.originating_device:usb.product_id" int="0x4810">
+ <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.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.type" type="string">ipod</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/aac</append>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
<!-- ROKR e2 Memory Card mode -->
<match key="@storage.originating_device:usb.product_id" int="0x608d">
<merge key="storage.model" type="string">ROKR e2</merge>
@@ -949,115 +1029,9 @@
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
-
</match>
- </match>
- <!-- Philips -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x471">
- <!-- Philips GoGear SA1330 -->
- <match key="@storage.originating_device:usb.product_id" int="0x165">
- <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.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- </match>
</match>
-
- <!-- Motorola iTunes enabled phone -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
- <match key="@storage.originating_device:usb.product_id" int="0x4810">
- <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.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.type" type="string">ipod</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/aac</append>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
- </match>
-
- <!-- Sandisk Corp. Sansa m250 (maybe others as well) -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x0781">
- <match key="@storage.originating_device:usb.product_id" int="0x7401">
- <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/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
- </match>
- </match>
-
- <!-- Nexia NX58XX (including Super*Talent MegaScreen) -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x1718">
- <match key="@storage.originating_device:usb.product_id" int="0x1013">
- <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/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
- </match>
- </match>
-
- <!-- Feiya Technology Corp Memory Bar -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x090c">
- <match key="@storage.originating_device:usb.product_id" int="0x1000">
- <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/mpeg</append>
- </match>
- </match>
-
- <!-- MPMan MP-Ki 128 Player -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x10d6">
- <match key="@storage.originating_device:usb.product_id" int="0x1100">
- <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.folder_depth" type="int">0</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.output_formats" type="strlist">audio/x-wav</append>
- </match>
- </match>
-
- <!-- Sandisk Corp. Sansa e270 (maybe others as well) -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x0781">
- <match key="@storage.originating_device:usb.product_id" int="0x7421">
- <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/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
- </match>
- </match>
-
</match>
<!-- USB devices that are music players but uses a user-space library -->
More information about the hal-commit
mailing list