videolibrary: update library node XMLs to use the new grouping in smartplaylists

26 files changed, 78 insertions, 52 deletions

diff --git a/system/library/video/movies/actors.xml b/system/library/video/movies/actors.xml
index 3ffdf46b67..811b29437b 100644
--- a/system/library/video/movies/actors.xml
+++ b/system/library/video/movies/actors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="4" type="folder">
+<node order="4" type="filter">
   <label>344</label>
-  <path>videodb://movies/actors/</path>
   <icon>DefaultActor.png</icon>
+  <content>movies</content>
+  <group>actors</group>
 </node>
 
diff --git a/system/library/video/movies/country.xml b/system/library/video/movies/country.xml
index a1934b3497..d1c6995378 100644
--- a/system/library/video/movies/country.xml
+++ b/system/library/video/movies/country.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="8" type="folder">
+<node order="8" type="filter">
   <label>20451</label>
-  <path>videodb://movies/countries/</path>
   <icon>DefaultCountry.png</icon>
+  <content>movies</content>
+  <group>countries</group>
 </node>
diff --git a/system/library/video/movies/directors.xml b/system/library/video/movies/directors.xml
index 4e1178ad15..68a0d340f0 100644
--- a/system/library/video/movies/directors.xml
+++ b/system/library/video/movies/directors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="5" type="folder">
+<node order="5" type="filter">
   <label>20348</label>
-  <path>videodb://movies/directors/</path>
   <icon>DefaultDirector.png</icon>
+  <content>movies</content>
+  <group>directors</group>
 </node>
diff --git a/system/library/video/movies/genres.xml b/system/library/video/movies/genres.xml
index fc47591794..f3fdf269f9 100644
--- a/system/library/video/movies/genres.xml
+++ b/system/library/video/movies/genres.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="1" type="folder">
+<node order="1" type="filter">
   <label>135</label>
-  <path>videodb://movies/genres/</path>
   <icon>DefaultGenre.png</icon>
+  <content>movies</content>
+  <group>genres</group>
 </node>
diff --git a/system/library/video/movies/sets.xml b/system/library/video/movies/sets.xml
index 87ab85c127..f87790ec29 100644
--- a/system/library/video/movies/sets.xml
+++ b/system/library/video/movies/sets.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="7" type="folder" visible="Library.HasContent(MovieSets)">
+<node order="7" type="filter" visible="Library.HasContent(MovieSets)">
   <label>20434</label>
-  <path>videodb://movies/sets/</path>
   <icon>DefaultSets.png</icon>
+  <content>movies</content>
+  <group>sets</group>
 </node>
diff --git a/system/library/video/movies/studios.xml b/system/library/video/movies/studios.xml
index a206331aa8..462fb95474 100644
--- a/system/library/video/movies/studios.xml
+++ b/system/library/video/movies/studios.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="6" type="folder">
+<node order="6" type="filter">
   <label>20388</label>
-  <path>videodb://movies/studios/</path>
   <icon>DefaultStudios.png</icon>
+  <content>movies</content>
+  <group>studios</group>
 </node>
diff --git a/system/library/video/movies/tags.xml b/system/library/video/movies/tags.xml
index 538609c54f..53c3ae4752 100644
--- a/system/library/video/movies/tags.xml
+++ b/system/library/video/movies/tags.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="9" type="folder">
+<node order="9" type="filter">
   <label>20459</label>
-  <path>videodb://movies/tags/</path>
   <icon>DefaultTags.png</icon>
+  <content>movies</content>
+  <group>tags</group>
 </node>
diff --git a/system/library/video/movies/titles.xml b/system/library/video/movies/titles.xml
index 3e71dee9c4..53e70446c3 100644
--- a/system/library/video/movies/titles.xml
+++ b/system/library/video/movies/titles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="2" type="folder">
+<node order="2" type="filter">
   <label>369</label>
-  <path>videodb://movies/titles/</path>
   <icon>DefaultMovieTitle.png</icon>
+  <content>movies</content>
+  <order direction="ascending">sorttitle</order>
 </node>
diff --git a/system/library/video/movies/years.xml b/system/library/video/movies/years.xml
index f73e080bd4..4f2f1d5c9f 100644
--- a/system/library/video/movies/years.xml
+++ b/system/library/video/movies/years.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="3" type="folder">
+<node order="3" type="filter">
   <label>562</label>
-  <path>videodb://movies/years/</path>
   <icon>DefaultYear.png</icon>
+  <content>movies</content>
+  <group>years</group>
 </node>
 
diff --git a/system/library/video/musicvideos/albums.xml b/system/library/video/musicvideos/albums.xml
index fe0e10860b..e72aa393f4 100644
--- a/system/library/video/musicvideos/albums.xml
+++ b/system/library/video/musicvideos/albums.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="5" type="folder">
+<node order="5" type="filter">
   <label>132</label>
-  <path>videodb://musicvideos/albums/</path>
   <icon>DefaultAlbum.png</icon>
+  <content>musicvideos</content>
+  <group>albums</group>
 </node>
diff --git a/system/library/video/musicvideos/artists.xml b/system/library/video/musicvideos/artists.xml
index 5f529b38b1..34da167dd0 100644
--- a/system/library/video/musicvideos/artists.xml
+++ b/system/library/video/musicvideos/artists.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="4" type="folder">
+<node order="4" type="filter">
   <label>133</label>
-  <path>videodb://musicvideos/artists/</path>
   <icon>DefaultArtist.png</icon>
+  <content>musicvideos</content>
+  <group>artists</group>
 </node>
diff --git a/system/library/video/musicvideos/directors.xml b/system/library/video/musicvideos/directors.xml
index 85b6721e92..d53263534f 100644
--- a/system/library/video/musicvideos/directors.xml
+++ b/system/library/video/musicvideos/directors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="6" type="folder">
+<node order="6" type="filter">
  <label>20348</label>
-  <path>videodb://musicvideos/directors/</path>
   <icon>DefaultDirector.png</icon>
+  <content>musicvideos</content>
+  <group>directors</group>
 </node>
diff --git a/system/library/video/musicvideos/genres.xml b/system/library/video/musicvideos/genres.xml
index 36e3ced9f9..751703ab68 100644
--- a/system/library/video/musicvideos/genres.xml
+++ b/system/library/video/musicvideos/genres.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="1" type="folder">
+<node order="1" type="filter">
   <label>135</label>
-  <path>videodb://musicvideos/genres/</path>
   <icon>DefaultGenre.png</icon>
+  <content>musicvideos</content>
+  <group>genres</group>
 </node>
diff --git a/system/library/video/musicvideos/studios.xml b/system/library/video/musicvideos/studios.xml
index 2583c0d0e7..d63ff7d916 100644
--- a/system/library/video/musicvideos/studios.xml
+++ b/system/library/video/musicvideos/studios.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="7" type="folder">
+<node order="7" type="filter">
   <label>20388</label>
-  <path>videodb://musicvideos/studios/</path>
   <icon>DefaultStudios.png</icon>
+  <content>musicvideos</content>
+  <group>studios</group>
 </node>
diff --git a/system/library/video/musicvideos/tags.xml b/system/library/video/musicvideos/tags.xml
index 6647b94606..0b96db68ac 100644
--- a/system/library/video/musicvideos/tags.xml
+++ b/system/library/video/musicvideos/tags.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="8" type="folder">
+<node order="8" type="filter">
   <label>20459</label>
-  <path>videodb://musicvideos/tags/</path>
   <icon>DefaultTags.png</icon>
+  <content>musicvideos</content>
+  <group>tags</group>
 </node>
diff --git a/system/library/video/musicvideos/titles.xml b/system/library/video/musicvideos/titles.xml
index b677f79e90..4bea08ab20 100644
--- a/system/library/video/musicvideos/titles.xml
+++ b/system/library/video/musicvideos/titles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="2" type="folder">
+<node order="2" type="filter">
   <label>369</label>
-  <path>videodb://musicvideos/titles/</path>
   <icon>DefaultMusicVideoTitle.png</icon>
+  <content>musicvideos</content>
+  <order direction="ascending">title</order>
 </node>
diff --git a/system/library/video/musicvideos/years.xml b/system/library/video/musicvideos/years.xml
index 8276088563..4586495247 100644
--- a/system/library/video/musicvideos/years.xml
+++ b/system/library/video/musicvideos/years.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="3" type="folder">
+<node order="3" type="filter">
   <label>562</label>
-  <path>videodb://musicvideos/years/</path>
   <icon>DefaultYear.png</icon>
+  <content>musicvideos</content>
+  <group>years</group>
 </node>
diff --git a/system/library/video/tvshows/actors.xml b/system/library/video/tvshows/actors.xml
index 110afc30ae..761e81fab3 100644
--- a/system/library/video/tvshows/actors.xml
+++ b/system/library/video/tvshows/actors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="4" type="folder">
+<node order="4" type="filter">
   <label>344</label>
-  <path>videodb://tvshows/actors/</path>
   <icon>DefaultActor.png</icon>
+  <content>tvshows</content>
+  <group>actors</group>
 </node>
diff --git a/system/library/video/tvshows/genres.xml b/system/library/video/tvshows/genres.xml
index 2bd51d185a..69b4dcdeaf 100644
--- a/system/library/video/tvshows/genres.xml
+++ b/system/library/video/tvshows/genres.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="1" type="folder">
+<node order="1" type="filter">
   <label>135</label>
-  <path>videodb://tvshows/genres/</path>
   <icon>DefaultGenre.png</icon>
+  <content>tvshows</content>
+  <group>genres</group>
 </node>
diff --git a/system/library/video/tvshows/studios.xml b/system/library/video/tvshows/studios.xml
index 638629295f..0362dbf443 100644
--- a/system/library/video/tvshows/studios.xml
+++ b/system/library/video/tvshows/studios.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="5" type="folder">
+<node order="5" type="filter">
   <label>20388</label>
-  <path>videodb://tvshows/studios/</path>
   <icon>DefaultStudios.png</icon>
+  <content>tvshows</content>
+  <group>studios</group>
 </node>
diff --git a/system/library/video/tvshows/tags.xml b/system/library/video/tvshows/tags.xml
index 90c8880ec9..4682aea5b8 100644
--- a/system/library/video/tvshows/tags.xml
+++ b/system/library/video/tvshows/tags.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="6" type="folder">
+<node order="6" type="filter">
   <label>20459</label>
   <icon>DefaultTags.png</icon>
-  <path>videodb://tvshows/tags/</path>
+  <content>tvshows</content>
+  <group>tags</group>
 </node>
diff --git a/system/library/video/tvshows/titles.xml b/system/library/video/tvshows/titles.xml
index 653770ce0e..8f32d21912 100644
--- a/system/library/video/tvshows/titles.xml
+++ b/system/library/video/tvshows/titles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="2" type="folder">
+<node order="2" type="filter">
   <label>369</label>
-  <path>videodb://tvshows/titles/</path>
   <icon>DefaultTVShowTitle.png</icon>
+  <content>tvshows</content>
+  <order direction="ascending">sorttitle</order>
 </node>
diff --git a/system/library/video/tvshows/years.xml b/system/library/video/tvshows/years.xml
index 994bfabaf2..ae4a745c7b 100644
--- a/system/library/video/tvshows/years.xml
+++ b/system/library/video/tvshows/years.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="3" type="folder">
+<node order="3" type="filter">
   <label>562</label>
-  <path>videodb://tvshows/years/</path>
   <icon>DefaultYear.png</icon>
+  <content>tvshows</content>
+  <group>years</group>
 </node>
diff --git a/system/library/video_flat/movies.xml b/system/library/video_flat/movies.xml
index 0b53ebe7d6..13f2904e84 100644
--- a/system/library/video_flat/movies.xml
+++ b/system/library/video_flat/movies.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="1" type="folder" visible="Library.HasContent(Movies)">
+<node order="1" type="filter" visible="Library.HasContent(Movies)">
   <label>342</label>
-  <path>videodb://movies/titles/</path>
   <icon>DefaultMovies.png</icon>
+  <content>movies</content>
+  <order direction="ascending">sorttitle</order>
 </node>
diff --git a/system/library/video_flat/musicvideos.xml b/system/library/video_flat/musicvideos.xml
index d5aed3a8d0..5922b81343 100644
--- a/system/library/video_flat/musicvideos.xml
+++ b/system/library/video_flat/musicvideos.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="3" type="folder" visible="Library.HasContent(MusicVideos)">
+<node order="3" type="filter" visible="Library.HasContent(MusicVideos)">
   <label>20389</label>
-  <path>videodb://musicvideos/titles/</path>
   <icon>DefaultMusicVideos.png</icon>
+  <content>musicvideos</content>
+  <order direction="ascending">title</order>
 </node>
diff --git a/system/library/video_flat/tvshows.xml b/system/library/video_flat/tvshows.xml
index aa1c7836a3..5f19e4d89b 100644
--- a/system/library/video_flat/tvshows.xml
+++ b/system/library/video_flat/tvshows.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<node order="2" type="folder" visible="Library.HasContent(TVShows)">
+<node order="2" type="filter" visible="Library.HasContent(TVShows)">
   <label>20343</label>
-  <path>videodb://tvshows/titles/</path>
   <icon>DefaultTVShows.png</icon>
+  <content>tvshows</content>
+  <order direction="ascending">sorttitle</order>
 </node>