hal-info: Branch 'master'

Danny Kukawka dkukawka at kemper.freedesktop.org
Mon Feb 2 03:58:32 PST 2009 

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

New commits:
commit da022f3321f0859dd6410cc097ec8eb8960dcd9b
Author: Milan Bouchet-Valat <nalimilan at club.fr>
Date:   Mon Feb 2 12:56:49 2009 +0100

    fix Cowon iAUDIO music players
    
    Fixed Cowon iAUDIO music players.
    
    From https://bugs.freedesktop.org/show_bug.cgi?id=19069:
    
    > I've reviewed in 10-usb-music-players.fdi all information about Cowon iAUDIO
    > players, and I've found several mistakes. I'm myself the owner of a M3, and I
    > had noticed its folders were not set right
    
    > I've split the common entry for M3, X5, M5, 5, G2 into several sections,
    > because they don't use the same file structure nor support the same formats.
    > I've been parsing the manuals from Cowon to find out how they work, and I think
    > I've managed to get all the informations needed.
    
    > Though, I can only be completely sure of the informations about the M3, I could
    > not check for other (even if it should be good). In particular:
    > - I'm not sure the product_id for iAUDIO 5 are 0x602 and 0x604. Those numbers
    > are strange to me as they don't seem to follow any logical rule. Anyway, I'm
    > sure of these IDs for the other players, so these must be the right ones. If
    > somebody could check, it could be nice.
    
    > - I'm not sure that the iAUDIO G* series uses or doesn't use a MUSIC/ folder
    > separate from the root. Older iAUDIOs do, others simply use the root folder for
    > that. I've guessed from the manual, but I could not correct every error -
    > anyway it should be better than before.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9e72a94..ca0ca2a 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -536,10 +536,23 @@
 
 	<!-- Cowon -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
-	  <!-- iAudio M3, X5, M5, 5, G2 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x602;0x604;0x760">
+	  <!-- iAUDIO M3 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500">
 	    <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/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/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.playlist_format" type="strlist">audio/x-mpegurl</append>
+	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+	  </match>
+	  <!-- iAUDIO X5, M5 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520">
+	    <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/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/flac</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
@@ -547,36 +560,62 @@
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
 	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
 	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <match key="@storage.originating_device:usb.product_id" int="0x760">
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-	    </match>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
 	  </match>
-	  <!-- iAudio U2 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x600">
+	  <!-- iAUDIO 5 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x602;0x604">
+	    <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/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/mpeg</append>
+	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+	  </match>
+	  <!-- iAUDIO G2 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="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/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/mpeg</append>
+	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
 	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	  </match>
+	  <!-- iAUDIO U2 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x600">
+	    <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/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/mpeg</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>
 	  </match>
-	  <!-- iAudio G3 -->
+	  <!-- iAUDIO G3 -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x601">
 	    <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/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/mpeg</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>
-	  <!-- iAudio U3 -->
+	  <!-- iAUDIO U3 -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x700">
 	    <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/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/flac</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
@@ -590,10 +629,11 @@
 	    <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, iAudio 7 -->
+          <!-- iAUDIO F2, iAUDIO 7 -->
           <match key="@storage.originating_device:usb.product_id" int_outof="0x710;0x730;0x750">
             <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/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/flac</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>

More information about the hal-commit mailing list