hal/fdi/information/10freedesktop 10-usb-music-players.fdi, 1.15, 1.16

[David Zeuthen]

Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory kemper:/tmp/cvs-serv21468/fdi/information/10freedesktop

Modified Files:
	10-usb-music-players.fdi 
Log Message:
2006-04-26  David Zeuthen  <davidz at redhat.com>

        Patch from Gabriel Burt <gabriel.burt at gmail.com>.

        After some further consideration, I think the
        portable_audio_player.filepath_format property should be removed
        and a new property, folder_depth, should be created.  The main
        point of the filepath_format property was to convey whether the
        device only supported a limited file hierarchy, but it ended up
        conveying much more than that - specifying exactly what directory
        structure the music files should go in, when that's really not
        appropriate (since the hardware doesn't care except in the
        hierarchy depth case).  The folder to write files out to can be
        taken from the first entry in the audio_folders property.  This
        change will allow the application to choose the appropriate
        directory structure (/podcasts/NPR/****, /Artist/Album/00 - Title,
        etc). I've attached a patch that make this change in the
        hal-spec.xml.in as well as another patch that adds some of these
        new properties for a few audio devices.

        * doc/spec/hal-spec.xml.in: Update spec

        * fdi/information/10freedesktop/10-usb-music-players.fdi: Update
        to reflect new spec



Index: 10-usb-music-players.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-music-players.fdi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- 10-usb-music-players.fdi	12 Apr 2006 21:23:59 -0000	1.15
+++ 10-usb-music-players.fdi	26 Apr 2006 15:00:38 -0000	1.16
@@ -422,6 +422,8 @@
 	    <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 5 -->
 	  <match key="@storage.physical_device:usb.product_id" int="0x602">
@@ -466,6 +468,15 @@
 	    <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.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.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">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>