hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |   59 -----------------
 1 file changed, 59 deletions(-)

New commits:
commit 8dc716e78dcf5a620b84469f93aec54d8df7144c
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Oct 2 17:42:14 2008 +0200

    cleaned up 10-usb-music-players.fdi
    
    Cleaned up 10-usb-music-players.fdi. Removed devices which needs unknown
    libs to run correctly. Some of them should be covered by libmtp or libifp,
    these libs should ship the correct/needed fdi file.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 182ef39..fee75dd 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -868,65 +868,6 @@
       </match>
     </match>
 
-    <!-- USB devices that are music players but uses a user-space library -->
-    <!-- NOTE: they need to get removed or ported to the new keys -->
-    <match key="info.subsystem" string="usb">
-      <!-- Archos -->
-      <match key="usb.vendor_id" int="0xe79">
-        <!-- GMini 120 -->
-        <match key="usb.product_id" int="0x1201">
-          <addset key="portable_audio_player.access_method.protocols" type="strlist">user</addset>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <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.input_formats" type="strlist">audio/x-wav</append>
-	</match>
-        <!-- GMini XS202 -->
-        <match key="usb.product_id" int="0x1206">
-          <addset key="portable_audio_player.access_method.protocols" type="strlist">user</addset>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <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>
-	  <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-	  <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	  <append key="portable_audio_player.playlist_path" type="strlist">Playlists/%File</append>
-        </match>
-      </match>
-
-      <match key="usb.vendor_id" int="0x1006">
-	<!-- iDP 100 UMS-->
-	<match key="usb.product_id" int="0x0001">
-          <addset key="portable_audio_player.access_method.protocols" type="strlist">user</addset>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-        </match>
-      </match>
-      <match key="usb.vendor_id" int="0x4102">
-	<!-- iFP 100/300/500 IMM (supports application/ogg only after firmware upgrade)-->
-	<match key="usb.product_id" int_outof="0x1001;0x1003;0x1005">
-          <addset key="portable_audio_player.access_method.protocols" type="strlist">user</addset>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <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>
-        </match>
-        <!-- iFP 700/800/1000/N10 IMM, H10 5,6 MTP -->
-	<match key="usb.product_id" int_outof="0x1007;0x1009;0x1010;0x1011;0x2105">
-          <addset key="portable_audio_player.access_method.protocols" type="strlist">user</addset>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <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>
-
     <!-- Set common keys for detected audio player if you have special cases add the player below this match -->
     <match key="portable_audio_player.access_method.protocols" exists="true">
       <match key="portable_audio_player.access_method.protocols" contains="storage">