*** 10-usb-music-players.fdi.orig    Tue May 13 17:28:19 2008
--- 10-usb-music-players.fdi    Tue May 13 17:28:49 2008
***************
*** 537,542 ****
--- 537,563 ----
            <!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
            <match key="@storage.originating_device:usb.product_id" int="0xd039">
              <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-amr</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-imy</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</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/x-amr</append>
+             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+           </match>
+ 
+           <!-- K800i mobile phone (alternative) -->
+           <!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
+           <match key="@storage.originating_device:usb.product_id" int="0xe039">
+             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
              <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
              <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
              <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
***************
*** 547,552 ****
--- 568,574 ----
              <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-amr</append>
+             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
            </match>
  
          <!-- W950i mobile phone -->