hal: Branch 'master'

[David Zeuthen]

 doc/spec/hal-spec-properties.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree ec201f8ef1428ed2e1ad1298f9dbb9210b928acc (from f1e062ae29f2fcea09a3ead31789ad9c074f942d)
Author: Gabriel Burt <gabriel.burt at gmail.com>
Date:   Sat Jul 29 12:07:41 2006 -0400

    Clarify what portable_audio_player.folder_depth means.
    
    > > Assuming that a device is not listed in the HAL fdi
    > > entry as having a limited depth, most software would probably use
    > > Artist/Album/Track when appropriate.  If you think this is not
    > > sufficient to support the W800i, let's certainly keep discussing it.
    >
    > That would indeed seem to work fine for the W800i, it just seems open
    > to more problems than the previous method of allowing an exact
    > specification. While I agree that software would probably use
    > Artist/Album/Track it might use Artist - Album/Track which doesn't
    > work.
    
    The real problem here is that your device requires a minimum (exact,
    actually) folder depth, right?  I think the best solution is to make
    the folder_depth field not be a max limit, but to be the exact depth
    required by a device.
    
    I've attached a patch that just clarifies the role of the
    portable_audio_device.folder_depth key.  I think this is a pretty
    simple way to solve this problem, and won't be too hard for app
    developers to implement.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 29a9d42..eaef610 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -3578,11 +3578,11 @@
               <entry>No</entry>
               <entry>
                 If portable_audio_player.access_method = "storage",
-                this tells applications how deep of directory hierarchies
-                files can be placed in.  If all files are put in a
-                sub-folder (with the audio_folders property), that folder
-                should not be included in the folder_depth.  If the device
-                does not have a limit, do not set this property.
+                this tells applications exactly how deep of directory hierarchies
+                files should be placed in.  If all files are put in a
+                sub-folder (with the audio_folders property), only the depth within
+                that sub-folder should be entered here. If the device does not have
+                a limit, do not set this property.
               </entry>
             </row>
             <row>