hal: Branch 'origin' - 3 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Tue Mar 6 09:59:32 PST 2007
configure.in | 2 -
fdi/information/10freedesktop/10-usb-music-players.fdi | 23 +++++++++++++++--
2 files changed, 22 insertions(+), 3 deletions(-)
New commits:
diff-tree aee9db6892551a86c1da0f31ba2a1c776dd8419a (from e3699bad5e8da3a986a585c7ff448fdfc90403b9)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Mar 5 21:17:31 2007 +0100
moved Nokia devices into existing structure/logic
Moved the NOkia N770 and N800 entries for USB music players into the
existing structure to avoid unneeded entries.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index b6524f6..9b94bb5 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -88,6 +88,25 @@
</match>
</match>
+ <match key="@storage.originating_device:usb.vendor_id" int="0x421">
+ <!-- Nokia 770 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x431">
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</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>
+ <!-- Nokia N800 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x4c3">
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</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>
+
<!-- SONICblue -->
<match key="@storage.originating_device:usb.vendor_id" int="0x045a">
<!-- Rio Forge -->
@@ -903,33 +922,7 @@
<merge key="storage.drive_type" type="string">memory_stick</merge>
</match>
</match>
- <match key="@storage.originating_device:usb.vendor_id" int="0x421">
- <!-- Nokia 770 -->
- <match key="@storage.originating_device:usb.product_id" int="0x431">
- <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">generic</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>
- <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>
- <!-- Nokia N800 -->
- <match key="@storage.originating_device:usb.product_id" int="0x4c3">
- <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">generic</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>
- <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>
</match>
-
+
</device>
</deviceinfo>
diff-tree e3699bad5e8da3a986a585c7ff448fdfc90403b9 (from 51210cb35a1bda02db982e6abc3ab60419c89050)
Author: William Jon McCann <mccann at jhu.edu>
Date: Mon Mar 5 14:37:03 2007 -0500
add portable_audio_player support for Nokia N770 and N800
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 27073f3..b6524f6 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -231,7 +231,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- MSCNMMC MP3 Player / Tevion MD80946 -->
- <match key="@storage.physical_device:usb.product_id" int="0x8004">
+ <match key="@storage.originating_device:usb.product_id" int="0x8004">
<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-wav</append>
@@ -903,6 +903,32 @@
<merge key="storage.drive_type" type="string">memory_stick</merge>
</match>
</match>
+ <match key="@storage.originating_device:usb.vendor_id" int="0x421">
+ <!-- Nokia 770 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x431">
+ <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">generic</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>
+ <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>
+ <!-- Nokia N800 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x4c3">
+ <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">generic</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>
+ <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>
</match>
</device>
diff-tree 51210cb35a1bda02db982e6abc3ab60419c89050 (from 302840ec67441f55ba07cae9991538e6c91f7fdc)
Author: David Zeuthen <davidz at redhat.com>
Date: Sun Mar 4 21:30:02 2007 -0500
update version to 20070304
diff --git a/configure.in b/configure.in
index 6ba0fb3..a2bc052 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT(hal-info, 20070228, david at fubar.dk)
+AC_INIT(hal-info, 20070304, david at fubar.dk)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
More information about the hal-commit
mailing list