fixed up svgs to point to the correct locations and have correct credentials

diff --git a/atv/assets/control.svg b/atv/assets/control.svg
index e7dae0ab839156ca78e647dd9fc5e5eb98d7444f..bcaf5b4c45d2aee6005f8f80491047464de53634 100644 (file)
--- a/atv/assets/control.svg
+++ b/atv/assets/control.svg
@@ -11,10 +11,12 @@
                        <rect x="4" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="0" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="0" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="0" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="15" y="0" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="0" width="1" height="1" fill="#000000"/>
@@ -25,8 +27,12 @@
                        <rect x="0" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="1" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="1" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="1" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="1" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="1" width="1" height="1" fill="#000000"/>
+                       <rect x="12" y="1" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="1" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="1" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="2" width="1" height="1" fill="#000000"/>
@@ -35,10 +41,9 @@
                        <rect x="4" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="2" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="2" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="2" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="21" y="2" width="1" height="1" fill="#000000"/>
@@ -49,10 +54,10 @@
                        <rect x="3" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="3" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="3" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="3" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="15" y="3" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="21" y="3" width="1" height="1" fill="#000000"/>
@@ -63,7 +68,6 @@
                        <rect x="3" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="4" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="4" width="1" height="1" fill="#000000"/>
@@ -75,11 +79,10 @@
                        <rect x="0" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="5" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="5" width="1" height="1" fill="#000000"/>
+                       <rect x="12" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="5" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="6" width="1" height="1" fill="#000000"/>
@@ -101,7 +104,6 @@
                        <rect x="22" y="6" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="6" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="6" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="7" width="1" height="1" fill="#000000"/>
@@ -110,81 +112,76 @@
                        <rect x="16" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="3" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="4" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="5" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="7" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="14" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="18" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="20" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="3" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="24" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="0" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="1" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="17" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="24" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="1" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="20" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="4" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="5" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="23" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="24" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="1" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="20" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="0" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="3" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="5" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="14" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="15" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="20" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="0" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="2" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="5" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="7" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="15" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="21" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="0" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="4" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="14" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="18" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="22" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="24" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="0" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="2" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="3" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="17" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="20" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="4" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="7" y="14" width="1" height="1" fill="#000000"/>
@@ -192,34 +189,32 @@
                        <rect x="9" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="17" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="18" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="24" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="1" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="2" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="3" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="5" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="7" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="18" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="21" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="16" width="1" height="1" fill="#000000"/>
-                       <rect x="4" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="16" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="16" width="1" height="1" fill="#000000"/>
@@ -229,12 +224,10 @@
                        <rect x="20" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="24" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="18" width="1" height="1" fill="#000000"/>
@@ -242,18 +235,18 @@
                        <rect x="4" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="18" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="18" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="18" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="18" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="23" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="24" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="19" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="19" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="19" width="1" height="1" fill="#000000"/>
@@ -265,60 +258,49 @@
                        <rect x="3" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="20" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="14" y="20" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="15" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="17" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="22" y="20" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="21" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="20" y="21" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="23" y="21" width="1" height="1" fill="#000000"/>
+                       <rect x="24" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="12" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="14" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="18" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="22" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="24" y="22" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="22" width="1" height="1" fill="#000000"/>
+                       <rect x="20" y="22" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="23" width="1" height="1" fill="#000000"/>
-                       <rect x="14" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="15" y="23" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="23" width="1" height="1" fill="#000000"/>
-                       <rect x="22" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="17" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="20" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="24" width="1" height="1" fill="#000000"/>
@@ -329,13 +311,11 @@
                        <rect x="8" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="24" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="15" y="24" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="17" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="24" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="24" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="24" width="1" height="1" fill="#000000"/>
                </g>

diff --git a/atv/assets/index.html b/atv/assets/index.html
index f51496a242f617afcf8ec15049d0ba7572153649..4e6ba3922710db0de8c14e68ac6f9ed0c885f33b 100644 (file)
--- a/atv/assets/index.html
+++ b/atv/assets/index.html
@@ -86,7 +86,7 @@ const connect = ()=>{
 
     ws.onmessage = (event)=>{
         const msg = JSON.parse(event.data);
-        if (msg["cmd"] != "queue")
+        if (msg["cmd"] != "queue" && msg["cmd"] != "items" && msg["cmd"] != "get_items" && msg["cmd"] != "enqueue")
         {
             console.log(msg);
             const prev = current;

diff --git a/atv/assets/ui.js b/atv/assets/ui.js
index b30c9410c0733ea5b029925d4a51ff627ae616b2..f8bdc38485c5d78bd427ed8e778c97111e7e6796 100644 (file)
--- a/atv/assets/ui.js
+++ b/atv/assets/ui.js
@@ -2,7 +2,7 @@ const UI = (()=>{
     const self = {};
 
     let queue = [];
-    let items = {};
+    let items = [];
     let path = [];
 
     const showBrowser = ()=>{
@@ -51,9 +51,15 @@ const UI = (()=>{
 
     self.browse_up = ()=>{
         path.pop();
-        refreshItems();
+        Client.send("get_items", { path: path });
+    };
+
+    const linkDown = (dir)=>{
+        path.push(dir);
+        Client.send("get_items", { path: path });
     };
 
+
     const refreshQueue = ()=>{
         if (queue.length > 0) {
             queueList.innerHTML = "";
@@ -75,23 +81,18 @@ const UI = (()=>{
         return root;
     };
 
-    const linkDown = (dir)=>{
-        path.push(dir);
-        refreshItems();
-    };
-
     const refreshItems = ()=>{
-        const dir = getLocalRoot();
         currDir.innerText = (path[path.length - 1] || "Root");
-
         itemList.innerText = "";
-        for (const item in dir) {
+        for (const item of items) {
             const el = document.createElement("div");
-            el.innerText = item;
-            if ('path' in dir[item]) {
-                el.onclick = ()=>{ self.enqueue(dir[item].path); };
+            el.innerText = item.name;
+            console.log(item);
+            console.log('path' in  item);
+            if ('path' in item) {
+                el.onclick = ()=>{ self.enqueue(item.path); };
             } else {
-                el.onclick = ()=>{ linkDown(item); };
+                el.onclick = ()=>{ linkDown(item.name); };
             }
             itemList.appendChild(el);
         }

diff --git a/atv/assets/wifi.svg b/atv/assets/wifi.svg
index d9cca2393b5e26f76d867be3d39ecd5f52ef7917..da36cf12215b9262114f3774da13c537052b0322 100644 (file)
--- a/atv/assets/wifi.svg
+++ b/atv/assets/wifi.svg
@@ -11,13 +11,12 @@
                        <rect x="4" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="0" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="0" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="0" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="0" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="0" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="0" width="1" height="1" fill="#000000"/>
+                       <rect x="17" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="0" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="0" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="0" width="1" height="1" fill="#000000"/>
@@ -29,12 +28,10 @@
                        <rect x="0" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="1" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="1" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="1" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="1" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="1" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="1" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="1" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="1" width="1" height="1" fill="#000000"/>
@@ -43,12 +40,15 @@
                        <rect x="3" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="2" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="2" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="2" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="2" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="2" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="2" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="2" width="1" height="1" fill="#000000"/>
+                       <rect x="20" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="2" width="1" height="1" fill="#000000"/>
                        <rect x="25" y="2" width="1" height="1" fill="#000000"/>
@@ -59,10 +59,14 @@
                        <rect x="3" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="3" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="3" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="3" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="3" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="3" width="1" height="1" fill="#000000"/>
+                       <rect x="17" y="3" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="3" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="3" width="1" height="1" fill="#000000"/>
@@ -75,12 +79,6 @@
                        <rect x="4" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="4" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="4" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="4" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="4" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="4" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="4" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="4" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="4" width="1" height="1" fill="#000000"/>
@@ -90,10 +88,12 @@
                        <rect x="0" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="5" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="11" y="5" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="5" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="5" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="5" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="5" width="1" height="1" fill="#000000"/>
+                       <rect x="20" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="5" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="6" width="1" height="1" fill="#000000"/>
@@ -118,229 +118,223 @@
                        <rect x="27" y="6" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="6" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="7" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="7" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="7" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="7" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="7" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="7" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="7" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="2" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="5" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="3" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="17" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="20" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="8" width="1" height="1" fill="#000000"/>
+                       <rect x="26" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="27" y="8" width="1" height="1" fill="#000000"/>
-                       <rect x="28" y="8" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="2" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="1" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="3" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="5" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="7" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="17" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="23" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="25" y="9" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="9" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="9" width="1" height="1" fill="#000000"/>
+                       <rect x="0" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="1" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="7" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="10" width="1" height="1" fill="#000000"/>
-                       <rect x="23" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="25" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="10" width="1" height="1" fill="#000000"/>
+                       <rect x="28" y="10" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="4" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="14" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="17" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="20" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="25" y="11" width="1" height="1" fill="#000000"/>
+                       <rect x="26" y="11" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="11" width="1" height="1" fill="#000000"/>
-                       <rect x="3" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="0" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="12" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="12" width="1" height="1" fill="#000000"/>
-                       <rect x="3" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="25" y="12" width="1" height="1" fill="#000000"/>
+                       <rect x="1" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="4" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="17" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="25" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="26" y="13" width="1" height="1" fill="#000000"/>
-                       <rect x="28" y="13" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="13" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="2" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="1" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="3" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="20" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="14" width="1" height="1" fill="#000000"/>
-                       <rect x="25" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="26" y="14" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="14" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="3" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="15" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="25" y="15" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="15" width="1" height="1" fill="#000000"/>
+                       <rect x="0" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="16" width="1" height="1" fill="#000000"/>
-                       <rect x="5" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="4" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="16" width="1" height="1" fill="#000000"/>
-                       <rect x="7" y="16" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="16" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="25" y="16" width="1" height="1" fill="#000000"/>
-                       <rect x="28" y="16" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="16" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="4" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="5" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="3" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="20" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="17" width="1" height="1" fill="#000000"/>
-                       <rect x="25" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="26" y="17" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="17" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="1" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="4" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="5" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="7" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="18" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="18" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="18" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="18" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="25" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="26" y="18" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="18" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="19" width="1" height="1" fill="#000000"/>
+                       <rect x="3" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="11" y="19" width="1" height="1" fill="#000000"/>
+                       <rect x="5" y="19" width="1" height="1" fill="#000000"/>
+                       <rect x="7" y="19" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="19" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="19" width="1" height="1" fill="#000000"/>
+                       <rect x="23" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="25" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="26" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="19" width="1" height="1" fill="#000000"/>
-                       <rect x="28" y="19" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="1" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="20" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="17" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="21" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="26" y="20" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="20" width="1" height="1" fill="#000000"/>
+                       <rect x="25" y="20" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="9" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="21" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="21" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="25" y="21" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="21" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="22" width="1" height="1" fill="#000000"/>
@@ -348,85 +342,93 @@
                        <rect x="4" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="5" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="22" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="10" y="22" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="22" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="22" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="22" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="22" width="1" height="1" fill="#000000"/>
+                       <rect x="28" y="22" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="23" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="23" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="16" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="23" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="23" width="1" height="1" fill="#000000"/>
-                       <rect x="25" y="23" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="23" width="1" height="1" fill="#000000"/>
+                       <rect x="26" y="23" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="24" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="24" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="24" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="24" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="24" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="20" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="21" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="24" y="24" width="1" height="1" fill="#000000"/>
+                       <rect x="25" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="26" y="24" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="24" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="25" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="25" width="1" height="1" fill="#000000"/>
+                       <rect x="8" y="25" width="1" height="1" fill="#000000"/>
+                       <rect x="9" y="25" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="25" width="1" height="1" fill="#000000"/>
-                       <rect x="16" y="25" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="25" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="25" width="1" height="1" fill="#000000"/>
-                       <rect x="23" y="25" width="1" height="1" fill="#000000"/>
+                       <rect x="21" y="25" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="26" y="25" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="25" width="1" height="1" fill="#000000"/>
+                       <rect x="28" y="25" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="2" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="3" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="4" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="26" width="1" height="1" fill="#000000"/>
-                       <rect x="8" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="26" width="1" height="1" fill="#000000"/>
-                       <rect x="13" y="26" width="1" height="1" fill="#000000"/>
-                       <rect x="15" y="26" width="1" height="1" fill="#000000"/>
+                       <rect x="14" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="26" width="1" height="1" fill="#000000"/>
-                       <rect x="20" y="26" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="26" width="1" height="1" fill="#000000"/>
+                       <rect x="19" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="23" y="26" width="1" height="1" fill="#000000"/>
-                       <rect x="26" y="26" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="26" width="1" height="1" fill="#000000"/>
+                       <rect x="25" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="26" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="27" width="1" height="1" fill="#000000"/>
                        <rect x="6" y="27" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="27" width="1" height="1" fill="#000000"/>
+                       <rect x="10" y="27" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="27" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="27" width="1" height="1" fill="#000000"/>
+                       <rect x="13" y="27" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="27" width="1" height="1" fill="#000000"/>
+                       <rect x="17" y="27" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="27" width="1" height="1" fill="#000000"/>
-                       <rect x="19" y="27" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="27" width="1" height="1" fill="#000000"/>
                        <rect x="22" y="27" width="1" height="1" fill="#000000"/>
-                       <rect x="23" y="27" width="1" height="1" fill="#000000"/>
+                       <rect x="25" y="27" width="1" height="1" fill="#000000"/>
+                       <rect x="27" y="27" width="1" height="1" fill="#000000"/>
                        <rect x="28" y="27" width="1" height="1" fill="#000000"/>
                        <rect x="0" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="1" y="28" width="1" height="1" fill="#000000"/>
@@ -437,19 +439,17 @@
                        <rect x="6" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="8" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="9" y="28" width="1" height="1" fill="#000000"/>
-                       <rect x="10" y="28" width="1" height="1" fill="#000000"/>
+                       <rect x="11" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="12" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="13" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="14" y="28" width="1" height="1" fill="#000000"/>
-                       <rect x="17" y="28" width="1" height="1" fill="#000000"/>
+                       <rect x="15" y="28" width="1" height="1" fill="#000000"/>
+                       <rect x="16" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="18" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="19" y="28" width="1" height="1" fill="#000000"/>
-                       <rect x="21" y="28" width="1" height="1" fill="#000000"/>
-                       <rect x="23" y="28" width="1" height="1" fill="#000000"/>
+                       <rect x="22" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="25" y="28" width="1" height="1" fill="#000000"/>
                        <rect x="26" y="28" width="1" height="1" fill="#000000"/>
-                       <rect x="27" y="28" width="1" height="1" fill="#000000"/>
-                       <rect x="28" y="28" width="1" height="1" fill="#000000"/>
                </g>
        </g>
 </svg>

diff --git a/atv/lib/atv/channel.rb b/atv/lib/atv/channel.rb
index 42a2c263ce4f9224a18d68ccf8af27c03f690c9e..7b06f25e623da164631f912a3de75496e4b50f45 100644 (file)
--- a/atv/lib/atv/channel.rb
+++ b/atv/lib/atv/channel.rb
@@ -80,8 +80,23 @@ module ATV
       end
     end
 
-    def items()
-      { "items" => filedata[:tree] }
+    def items(path = [])
+      tree = filedata[:tree]
+      path.each do |dir|
+        tree = tree[dir] || {}
+      end
+      items = tree.map do |e|
+        data = { "name" => e[0] }
+        if e[1]["path"]
+          data["type"] = "file"
+          data["path"] = e[1]["path"]
+        else
+          data["type"] = "dir"
+        end
+        data
+      end
+      pp items
+      { "items" => items }
     end
 
     def queue()

diff --git a/atv/lib/atv/player.rb b/atv/lib/atv/player.rb
index 973dcebcb37aa1cc9922b95f86c1e1f69d210cf4..97389743a94d95d8fd5fb553894d165949a4d105 100644 (file)
--- a/atv/lib/atv/player.rb
+++ b/atv/lib/atv/player.rb
@@ -56,8 +56,8 @@ module ATV
       })
     end
 
-    def items()
-      @channels[@channel].items
+    def items(path = [])
+      @channels[@channel].items(path)
     end
 
     def queue()

diff --git a/atv/lib/atv/server.rb b/atv/lib/atv/server.rb
index 5fe6a3e9d5a33af05c1c48e9fff65df531351e21..34cab9d8da40fcf8129c2600f9980b1c07e78b0a 100644 (file)
--- a/atv/lib/atv/server.rb
+++ b/atv/lib/atv/server.rb
@@ -79,7 +79,7 @@ module ATV
     end
 
     def on_get_items(client, data)
-      client_send(client, "items", @@player.items)
+      client_send(client, "items", @@player.items(data["path"] || []))
     end
 
     def on_get_queue(client, data)