[jmarshall]

Hi guys,

On my github, you'll find a files_in_lib branch which removes the use of MyVideo.xml, replacing it with a Files node in the root of the library. It also takes care of ActivateWindow(VideoFiles) etc. for you, and gives you a new ActivateWindow(Videos,Files) as the new one - see the confluence changes for instance - no need to specify the window as VideoLibrary anymore given there is only one.

What we have there is the first step. Features are:

1. Files node in library that lists the users' sources (i.e. basically replicates what was in the file view before).
2. Retrieval of video information for items in the files node listing that are also in the library - we also replace folders with their content as well.
3. We dump a "Add Videos..." item on root if the user has no sources.
4. You have a new directory vfs "sources://video/" to grab this node (not that that's much use to ya yet...)

Basically I'd like you to have a play around with it and see what you think. Find anything that's missing (eg context menu is a bloody mess) and what you think can be removed or improved etc - for instance, I may not have got all the cases for retrieval of file info from the library (stacks of video_ts folders maybe?). Sorting modes might be out (eg we could potentially use some of the library sorting modes if we have info available for items) as well. I have a further commit or two to go in which fixes the stacking button (id 7 needs adding to VideoNav.xml), and also fixes build on win32 and linux - I'll get those up there later today.

One thing I'm not sure about is the info retrieval is done in a background thread - it works quite well if you have a lot of items in a folder, but means that sorting or filtering doesn't work as we don't have the info to do it on dir listing. There's a couple of solutions to this - we could either grab the info for each item "in-line" which will slow down the directory listing (see files view in music with tag reading turned on), or could tell the view to refresh after we've got all the info, which will cause a "jarring" as the list re-sorts, or we could sort/filter as we go, which will cause items to disappear/reorder themselves, or something else entirely :p

Only once you're happy with it will I merge it to master. Once that's done I'll start on the music library for consistency then look to move on to allowing the video lib to be more customised (eg customise the heirarchy).

EDIT: Ok, this is in master. What do you need to do?

1. Remove any library/files buttons in MyVideosNav.xml.
2. Move any files-specific views from MyVideos.xml into MyVideosNav.xml if you like (most skins I see don't need to do anything here as they use includes for views) and delete MyVideos.xml
3. Change any references to "VideoFiles" in ActivateWindow calls to ActivateWindow(Videos,Files[,return])
4. Change any references to "VideoLibrary" in ActivateWindow calls to ActivateWindow(Videos,<whatever you had before>)
5. Remove any label control (if you have it) for the "No information in the database" message.

Cheers,
Jonathan