Attachment 21121 Details for Bug 19069 – Patch against 10-usb-music-players.fdi

[patch] Patch against 10-usb-music-players.fdi

10-usb-music-players.fdi.diff (text/plain), 8.22 KB, created by Milan Bouchet-Valat on 2008-12-13 02:43:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Bouchet-Valat

Created: 2008-12-13 02:43:50 UTC

Size: 8.22 KB

patch

obsolete

>--- /usr/share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi	2008-11-24 12:17:52.000000000 +0100
>+++ Bureau/10-usb-music-players.fdi	2008-12-13 11:36:52.000000000 +0100
>@@ -498,10 +498,23 @@
> 
> 	
> 	<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
>-	  
>-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x602;0x604;0x760">
>+	  
>+	  <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>
>+	  
>+	  <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>
>@@ -509,36 +522,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>
>-	  
>-	  <match key="@storage.originating_device:usb.product_id" int="0x600">
>+	  
>+	  <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>
>+	  
>+	  <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>
>+	  
>+	  <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>
>-	  
>+	  
> 	  <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>
>-	  
>+	  
> 	  <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>
>@@ -552,10 +591,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>
>-          
>+          
>           <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>

Actions: View | Splinter Review

Attachments on bug 19069: 21121

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.