hal-info: Branch 'master' - 2 commits

Danny Kukawka dkukawka at kemper.freedesktop.org
Mon Feb 2 04:06:19 PST 2009 

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

New commits:
commit f30923968c5282db51ecfded5d11a56fea7e10e2
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Feb 2 13:04:43 2009 +0100

    fixed usage of int_outof
    
    fixed single usage of 'int_outof', replaced with 'int'

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 801d1dd..cf4982f 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -569,7 +569,7 @@
 	    <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>
 	    <!-- iAUDIO G2 -->
-	    <match key="@storage.originating_device:usb.product_id" int_outof="0x760">
+	    <match key="@storage.originating_device:usb.product_id" int="0x760">
 	      <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>
commit bc6c15868c5543a9f1756681e0d70f4a7b35a20d
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Feb 2 12:59:36 2009 +0100

    cleaned up Cowon iAUDIO music players
    
    Cleaned up Cowon iAUDIO music players.
    
    - Removed not needed audio/mpeg from output_formats, the entry get
      added anyway for all mp3 players.
    - put common players together, handle different path (music, playlist)
      information in submatches.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index ca0ca2a..801d1dd 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -536,114 +536,51 @@
 
 	<!-- Cowon -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
-	  <!-- iAUDIO M3 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500">
+	  <!-- iAUDIO M3, X5, M5, U3 , F2, 7-->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x700;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>
 	    <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>
+	    <!-- iAUDIO X5, M5, F2, 7 -->
+	    <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
+	      <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 U3 -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x700">
+	      <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>
 	  </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>
-	    <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 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">
+	  <!-- iAUDIO U2, G3, 5, G2 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x600;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/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 -->
-	  <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 -->
-	  <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>
-	    <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>
-	    <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.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>
+	    <!-- iAUDIO G2 -->
+	    <match key="@storage.originating_device:usb.product_id" int_outof="0x760">
+	      <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">
+	      <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>
 	  </match>
-          <!-- 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>
-            <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>
-            <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>
-          </match>
 	</match>
 
 	<!-- Archos -->

More information about the hal-commit mailing list