hal-info: Branch 'master'

Martin Pitt martin at kemper.freedesktop.org
Wed Apr 22 04:25:55 PDT 2009


 fdi/information/10freedesktop/10-usb-music-players.fdi |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 86a4757914cc51602c05147f45592869c11bbacc
Author: André Rigollet <andre at andrerobot.org>
Date:   Wed Apr 22 13:24:24 2009 +0200

    fix iAUDIO U2 music player capabilities
    
    The iAUDIO U2 does not support playlists. Also, the previous fdi version
    duplicated the entry for the U2.
    
    Reported in fd#21150.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index fa1cc8a..b005570 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -548,8 +548,8 @@
 	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
 	    </match>
 	  </match>
-	  <!-- iAUDIO U2, G3, 5, G2 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x600;0x601;0x602;0x604;0x760">
+	  <!-- iAUDIO G3, 5, G2 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604;0x760">
 	    <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>
@@ -565,6 +565,11 @@
 	    </match>
 	    <!-- iAUDIO U2 -->
 	    <match key="@storage.originating_device:usb.product_id" int="0x600">
+	      <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/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">RECORDS/FM/</append>
 	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
 	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>


More information about the hal-commit mailing list