summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xliveengine/bin/data/american_football.xml68
-rwxr-xr-xliveengine/bin/data/barcelona.xml40
-rwxr-xr-xliveengine/bin/data/birds.xml68
-rwxr-xr-xliveengine/bin/data/computers.xml68
-rwxr-xr-xliveengine/bin/data/crests.xml68
-rwxr-xr-xliveengine/bin/data/cricket.xml68
-rwxr-xr-xliveengine/bin/data/dancing.xml68
-rwxr-xr-xliveengine/bin/data/food.xml68
-rwxr-xr-xliveengine/bin/data/insects.xml67
-rwxr-xr-xliveengine/bin/data/knights.xml56
-rwxr-xr-xliveengine/bin/data/makeplaylist.py34
-rwxr-xr-xliveengine/bin/data/mil_historic.xml68
-rwxr-xr-xliveengine/bin/data/military_ethnic.xml68
-rwxr-xr-xliveengine/bin/data/organs.xml68
-rwxr-xr-xliveengine/bin/data/panel.xml4
-rwxr-xr-xliveengine/bin/data/reptiles.xml68
-rwxr-xr-xliveengine/bin/data/settings.xml6
-rwxr-xr-xliveengine/bin/data/tai_chi.xml67
-rwxr-xr-xliveengine/bin/data/teamsports.xml67
-rwxr-xr-xliveengine/bin/data/tools.xml68
-rwxr-xr-xliveengine/bin/data/trainers.xml68
-rwxr-xr-xliveengine/bin/data/women_ethnic.xml68
-rwxr-xr-xliveengine/bin/data/yoga.xml68
-rwxr-xr-xliveengine/liveengine.layout26
-rwxr-xr-xliveengine/src/main.cpp2
-rwxr-xr-xliveengine/src/testApp.cpp10
-rwxr-xr-xliveengine/src/viewport.cpp8
-rwxr-xr-xliveengineUnmapped/src/main.cpp2
-rwxr-xr-xliveengineUnmapped/src/testApp.cpp249
-rwxr-xr-xliveengineUnmapped/src/testApp.h5
-rwxr-xr-xliveengineUnmapped/src/viewport.cpp10
-rwxr-xr-xliveengineUnmapped/src/viewport.h2
32 files changed, 169 insertions, 1506 deletions
diff --git a/liveengine/bin/data/american_football.xml b/liveengine/bin/data/american_football.xml
deleted file mode 100755
index 4a52a30..0000000
--- a/liveengine/bin/data/american_football.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="American Football">
- <svglayer note="36" file="american_football/FOOTB004.WMF.svg"/>
- <svglayer note="37" file="american_football/FOOTB005.WMF.svg"/>
- <svglayer note="38" file="american_football/FOOTB006.WMF.svg"/>
- <svglayer note="39" file="american_football/FOOTB008.WMF.svg"/>
- <svglayer note="40" file="american_football/FOOTB009.WMF.svg"/>
- <svglayer note="41" file="american_football/FOOTB011.WMF.svg"/>
- <svglayer note="42" file="american_football/FOOTB012.WMF.svg"/>
- <svglayer note="43" file="american_football/FOOTB013.WMF.svg"/>
- <svglayer note="44" file="american_football/FOOTB014.WMF.svg"/>
- <svglayer note="45" file="american_football/FOOTB015.WMF.svg"/>
- <svglayer note="46" file="american_football/FOOTB016.WMF.svg"/>
- <svglayer note="47" file="american_football/FOOTB017.WMF.svg"/>
- <svglayer note="48" file="american_football/FOOTB018.WMF.svg"/>
- <svglayer note="49" file="american_football/FOOTB019.WMF.svg"/>
- <svglayer note="50" file="american_football/FOOTB020.WMF.svg"/>
- <svglayer note="51" file="american_football/FOOTB027.WMF.svg"/>
- <svglayer note="52" file="american_football/FOOTB028.WMF.svg"/>
- <svglayer note="53" file="american_football/FOOTBALL.WMF.svg"/>
- <svglayer note="54" file="american_football/FOOTB004.WMF.svg"/>
- <svglayer note="55" file="american_football/FOOTB005.WMF.svg"/>
- <svglayer note="56" file="american_football/FOOTB006.WMF.svg"/>
- <svglayer note="57" file="american_football/FOOTB008.WMF.svg"/>
- <svglayer note="58" file="american_football/FOOTB009.WMF.svg"/>
- <svglayer note="59" file="american_football/FOOTB011.WMF.svg"/>
- <svglayer note="60" file="american_football/FOOTB012.WMF.svg"/>
- <svglayer note="61" file="american_football/FOOTB013.WMF.svg"/>
- <svglayer note="62" file="american_football/FOOTB014.WMF.svg"/>
- <svglayer note="63" file="american_football/FOOTB015.WMF.svg"/>
- <svglayer note="64" file="american_football/FOOTB016.WMF.svg"/>
- <svglayer note="65" file="american_football/FOOTB017.WMF.svg"/>
- <svglayer note="66" file="american_football/FOOTB018.WMF.svg"/>
- <svglayer note="67" file="american_football/FOOTB019.WMF.svg"/>
- <svglayer note="68" file="american_football/FOOTB020.WMF.svg"/>
- <svglayer note="69" file="american_football/FOOTB027.WMF.svg"/>
- <svglayer note="70" file="american_football/FOOTB028.WMF.svg"/>
- <svglayer note="71" file="american_football/FOOTBALL.WMF.svg"/>
- <svglayer note="72" file="american_football/FOOTB004.WMF.svg"/>
- <svglayer note="73" file="american_football/FOOTB005.WMF.svg"/>
- <svglayer note="74" file="american_football/FOOTB006.WMF.svg"/>
- <svglayer note="75" file="american_football/FOOTB008.WMF.svg"/>
- <svglayer note="76" file="american_football/FOOTB009.WMF.svg"/>
- <svglayer note="77" file="american_football/FOOTB011.WMF.svg"/>
- <svglayer note="78" file="american_football/FOOTB012.WMF.svg"/>
- <svglayer note="79" file="american_football/FOOTB013.WMF.svg"/>
- <svglayer note="80" file="american_football/FOOTB014.WMF.svg"/>
- <svglayer note="81" file="american_football/FOOTB015.WMF.svg"/>
- <svglayer note="82" file="american_football/FOOTB016.WMF.svg"/>
- <svglayer note="83" file="american_football/FOOTB017.WMF.svg"/>
- <svglayer note="84" file="american_football/FOOTB018.WMF.svg"/>
- <svglayer note="85" file="american_football/FOOTB019.WMF.svg"/>
- <svglayer note="86" file="american_football/FOOTB020.WMF.svg"/>
- <svglayer note="87" file="american_football/FOOTB027.WMF.svg"/>
- <svglayer note="88" file="american_football/FOOTB028.WMF.svg"/>
- <svglayer note="89" file="american_football/FOOTBALL.WMF.svg"/>
- <svglayer note="90" file="american_football/FOOTB004.WMF.svg"/>
- <svglayer note="91" file="american_football/FOOTB005.WMF.svg"/>
- <svglayer note="92" file="american_football/FOOTB006.WMF.svg"/>
- <svglayer note="93" file="american_football/FOOTB008.WMF.svg"/>
- <svglayer note="94" file="american_football/FOOTB009.WMF.svg"/>
- <svglayer note="95" file="american_football/FOOTB011.WMF.svg"/>
- <svglayer note="96" file="american_football/FOOTB012.WMF.svg"/>
- <svglayer note="97" file="american_football/FOOTB013.WMF.svg"/>
- <svglayer note="98" file="american_football/FOOTB014.WMF.svg"/>
- <svglayer note="99" file="american_football/FOOTB015.WMF.svg"/>
- <svglayer note="100" file="american_football/FOOTB016.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/barcelona.xml b/liveengine/bin/data/barcelona.xml
deleted file mode 100755
index 29d0a81..0000000
--- a/liveengine/bin/data/barcelona.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<playlist>
- <imglayer note="36" file="barcelona/IMG_6278.JPG"/>
- <imglayer note="37" file="barcelona/IMG_6288.JPG"/>
- <imglayer note="38" file="barcelona/IMG_6289.JPG"/>
- <imglayer note="39" file="barcelona/IMG_6290.JPG"/>
- <imglayer note="40" file="barcelona/IMG_6302.JPG"/>
- <imglayer note="41" file="barcelona/IMG_6316.JPG"/>
- <imglayer note="42" file="barcelona/IMG_6319.JPG"/>
- <imglayer note="43" file="barcelona/IMG_6370.JPG"/>
- <imglayer note="44" file="barcelona/IMG_6399.JPG"/>
- <imglayer note="45" file="barcelona/IMG_6454.JPG"/>
- <imglayer note="46" file="barcelona/IMG_6460.JPG"/>
- <imglayer note="47" file="barcelona/IMG_6446.JPG"/>
- <imglayer note="48" file="barcelona/IMG_6447.JPG"/>
- <imglayer note="49" file="barcelona/IMG_6448.JPG"/>
-
- <imglayer note="50" file="barcelona/IMG_6302.JPG"/>
- <imglayer note="51" file="barcelona/IMG_6316.JPG"/>
- <imglayer note="52" file="barcelona/IMG_6319.JPG"/>
- <imglayer note="53" file="barcelona/IMG_6370.JPG"/>
- <imglayer note="54" file="barcelona/IMG_6399.JPG"/>
- <imglayer note="55" file="barcelona/IMG_6454.JPG"/>
- <imglayer note="56" file="barcelona/IMG_6460.JPG"/>
- <imglayer note="57" file="barcelona/IMG_6446.JPG"/>
- <imglayer note="58" file="barcelona/IMG_6447.JPG"/>
- <imglayer note="59" file="barcelona/IMG_6448.JPG"/>
-
- <imglayer note="60" file="barcelona/IMG_6302.JPG"/>
- <imglayer note="61" file="barcelona/IMG_6316.JPG"/>
- <imglayer note="62" file="barcelona/IMG_6319.JPG"/>
- <imglayer note="63" file="barcelona/IMG_6370.JPG"/>
- <imglayer note="64" file="barcelona/IMG_6399.JPG"/>
- <imglayer note="65" file="barcelona/IMG_6454.JPG"/>
- <imglayer note="66" file="barcelona/IMG_6460.JPG"/>
- <imglayer note="67" file="barcelona/IMG_6446.JPG"/>
- <imglayer note="68" file="barcelona/IMG_6447.JPG"/>
- <imglayer note="69" file="barcelona/IMG_6448.JPG"/>
-</playlist>
-
diff --git a/liveengine/bin/data/birds.xml b/liveengine/bin/data/birds.xml
deleted file mode 100755
index 8ffd4d6..0000000
--- a/liveengine/bin/data/birds.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Birds">
- <svglayer note="36" file="birds/55.WMF.svg"/>
- <svglayer note="37" file="birds/AB01001A.WMF.svg"/>
- <svglayer note="38" file="birds/AB01005A.WMF.svg"/>
- <svglayer note="39" file="birds/AB01006A.WMF.svg"/>
- <svglayer note="40" file="birds/AB01008A.WMF.svg"/>
- <svglayer note="41" file="birds/AB01009A.WMF.svg"/>
- <svglayer note="42" file="birds/AB01012A.WMF.svg"/>
- <svglayer note="43" file="birds/AB01017A.WMF.svg"/>
- <svglayer note="44" file="birds/AB01018A.WMF.svg"/>
- <svglayer note="45" file="birds/AB01024A.WMF.svg"/>
- <svglayer note="46" file="birds/AB01025A.WMF.svg"/>
- <svglayer note="47" file="birds/AB01026A.WMF.svg"/>
- <svglayer note="48" file="birds/AB01027A.WMF.svg"/>
- <svglayer note="49" file="birds/AB01028A.WMF.svg"/>
- <svglayer note="50" file="birds/AB01029A.WMF.svg"/>
- <svglayer note="51" file="birds/AB01030A.WMF.svg"/>
- <svglayer note="52" file="birds/AB01033A.WMF.svg"/>
- <svglayer note="53" file="birds/AB01041A.WMF.svg"/>
- <svglayer note="54" file="birds/AB01043A.WMF.svg"/>
- <svglayer note="55" file="birds/AB01050A.WMF.svg"/>
- <svglayer note="56" file="birds/AB01053A.WMF.svg"/>
- <svglayer note="57" file="birds/AB01054A.WMF.svg"/>
- <svglayer note="58" file="birds/AB01058A.WMF.svg"/>
- <svglayer note="59" file="birds/AB01059A.WMF.svg"/>
- <svglayer note="60" file="birds/AB01061A.WMF.svg"/>
- <svglayer note="61" file="birds/AB01063A.WMF.svg"/>
- <svglayer note="62" file="birds/AB01065A.WMF.svg"/>
- <svglayer note="63" file="birds/AB01066A.WMF.svg"/>
- <svglayer note="64" file="birds/AB01067A.WMF.svg"/>
- <svglayer note="65" file="birds/AB01074A.WMF.svg"/>
- <svglayer note="66" file="birds/AB01501A.WMF.svg"/>
- <svglayer note="67" file="birds/AB01505A.WMF.svg"/>
- <svglayer note="68" file="birds/BIRD030.WMF.svg"/>
- <svglayer note="69" file="birds/BIRD035.WMF.svg"/>
- <svglayer note="70" file="birds/BIRD036.WMF.svg"/>
- <svglayer note="71" file="birds/BIRD041.WMF.svg"/>
- <svglayer note="72" file="birds/BIRD047.WMF.svg"/>
- <svglayer note="73" file="birds/ab01510a.wmf.svg"/>
- <svglayer note="74" file="birds/55.WMF.svg"/>
- <svglayer note="75" file="birds/AB01001A.WMF.svg"/>
- <svglayer note="76" file="birds/AB01005A.WMF.svg"/>
- <svglayer note="77" file="birds/AB01006A.WMF.svg"/>
- <svglayer note="78" file="birds/AB01008A.WMF.svg"/>
- <svglayer note="79" file="birds/AB01009A.WMF.svg"/>
- <svglayer note="80" file="birds/AB01012A.WMF.svg"/>
- <svglayer note="81" file="birds/AB01017A.WMF.svg"/>
- <svglayer note="82" file="birds/AB01018A.WMF.svg"/>
- <svglayer note="83" file="birds/AB01024A.WMF.svg"/>
- <svglayer note="84" file="birds/AB01025A.WMF.svg"/>
- <svglayer note="85" file="birds/AB01026A.WMF.svg"/>
- <svglayer note="86" file="birds/AB01027A.WMF.svg"/>
- <svglayer note="87" file="birds/AB01028A.WMF.svg"/>
- <svglayer note="88" file="birds/AB01029A.WMF.svg"/>
- <svglayer note="89" file="birds/AB01030A.WMF.svg"/>
- <svglayer note="90" file="birds/AB01033A.WMF.svg"/>
- <svglayer note="91" file="birds/AB01041A.WMF.svg"/>
- <svglayer note="92" file="birds/AB01043A.WMF.svg"/>
- <svglayer note="93" file="birds/AB01050A.WMF.svg"/>
- <svglayer note="94" file="birds/AB01053A.WMF.svg"/>
- <svglayer note="95" file="birds/AB01054A.WMF.svg"/>
- <svglayer note="96" file="birds/AB01058A.WMF.svg"/>
- <svglayer note="97" file="birds/AB01059A.WMF.svg"/>
- <svglayer note="98" file="birds/AB01061A.WMF.svg"/>
- <svglayer note="99" file="birds/AB01063A.WMF.svg"/>
- <svglayer note="100" file="birds/AB01065A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/computers.xml b/liveengine/bin/data/computers.xml
deleted file mode 100755
index d9be7e8..0000000
--- a/liveengine/bin/data/computers.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Computers">
- <svglayer note="36" file="computers/COMPU020.WMF.svg"/>
- <svglayer note="37" file="computers/COMPU021.WMF.svg"/>
- <svglayer note="38" file="computers/COMPU022.WMF.svg"/>
- <svglayer note="39" file="computers/CPMSE008.WMF.svg"/>
- <svglayer note="40" file="computers/CPMSE009.WMF.svg"/>
- <svglayer note="41" file="computers/CPMSE010.WMF.svg"/>
- <svglayer note="42" file="computers/CPMSE011.WMF.svg"/>
- <svglayer note="43" file="computers/CPMSE012.WMF.svg"/>
- <svglayer note="44" file="computers/CPMSE013.WMF.svg"/>
- <svglayer note="45" file="computers/DISK040.WMF.svg"/>
- <svglayer note="46" file="computers/DISK041.WMF.svg"/>
- <svglayer note="47" file="computers/DISK042.WMF.svg"/>
- <svglayer note="48" file="computers/HP500.WMF.svg"/>
- <svglayer note="49" file="computers/MAINF020.WMF.svg"/>
- <svglayer note="50" file="computers/MAINF021.WMF.svg"/>
- <svglayer note="51" file="computers/MAINF022.WMF.svg"/>
- <svglayer note="52" file="computers/MAINF023.WMF.svg"/>
- <svglayer note="53" file="computers/MAINF024.WMF.svg"/>
- <svglayer note="54" file="computers/MAINF025.WMF.svg"/>
- <svglayer note="55" file="computers/MAINF026.WMF.svg"/>
- <svglayer note="56" file="computers/MAINF027.WMF.svg"/>
- <svglayer note="57" file="computers/MAINF028.WMF.svg"/>
- <svglayer note="58" file="computers/MAINF029.WMF.svg"/>
- <svglayer note="59" file="computers/MAINF030.WMF.svg"/>
- <svglayer note="60" file="computers/MAINF031.WMF.svg"/>
- <svglayer note="61" file="computers/MAINF032.WMF.svg"/>
- <svglayer note="62" file="computers/MAINF033.WMF.svg"/>
- <svglayer note="63" file="computers/MAINF034.WMF.svg"/>
- <svglayer note="64" file="computers/MAINF035.WMF.svg"/>
- <svglayer note="65" file="computers/MAINF036.WMF.svg"/>
- <svglayer note="66" file="computers/MAINF037.WMF.svg"/>
- <svglayer note="67" file="computers/MAINF038.WMF.svg"/>
- <svglayer note="68" file="computers/MAINF039.WMF.svg"/>
- <svglayer note="69" file="computers/MAINF041.WMF.svg"/>
- <svglayer note="70" file="computers/MAINF048.WMF.svg"/>
- <svglayer note="71" file="computers/MAINF049.WMF.svg"/>
- <svglayer note="72" file="computers/MAINF050.WMF.svg"/>
- <svglayer note="73" file="computers/MAINF051.WMF.svg"/>
- <svglayer note="74" file="computers/MAINF052.WMF.svg"/>
- <svglayer note="75" file="computers/MAINF053.WMF.svg"/>
- <svglayer note="76" file="computers/MAINF054.WMF.svg"/>
- <svglayer note="77" file="computers/MAINF056.WMF.svg"/>
- <svglayer note="78" file="computers/MAINF058.WMF.svg"/>
- <svglayer note="79" file="computers/MAINF059.WMF.svg"/>
- <svglayer note="80" file="computers/MAINF060.WMF.svg"/>
- <svglayer note="81" file="computers/MAINF061.WMF.svg"/>
- <svglayer note="82" file="computers/MAINF062.WMF.svg"/>
- <svglayer note="83" file="computers/MAINF063.WMF.svg"/>
- <svglayer note="84" file="computers/MAINF064.WMF.svg"/>
- <svglayer note="85" file="computers/PERIF045.WMF.svg"/>
- <svglayer note="86" file="computers/PERIF046.WMF.svg"/>
- <svglayer note="87" file="computers/PERIF050.WMF.svg"/>
- <svglayer note="88" file="computers/PERIF071.WMF.svg"/>
- <svglayer note="89" file="computers/PERIF072.WMF.svg"/>
- <svglayer note="90" file="computers/PERIF073.WMF.svg"/>
- <svglayer note="91" file="computers/PERIF074.WMF.svg"/>
- <svglayer note="92" file="computers/PERIF075.WMF.svg"/>
- <svglayer note="93" file="computers/PERIF076.WMF.svg"/>
- <svglayer note="94" file="computers/PERIF077.WMF.svg"/>
- <svglayer note="95" file="computers/PERIF079.WMF.svg"/>
- <svglayer note="96" file="computers/PRINT043.WMF.svg"/>
- <svglayer note="97" file="computers/PRINT045.WMF.svg"/>
- <svglayer note="98" file="computers/PRINT049.WMF.svg"/>
- <svglayer note="99" file="computers/PRINT050.WMF.svg"/>
- <svglayer note="100" file="computers/PRINT051.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/crests.xml b/liveengine/bin/data/crests.xml
deleted file mode 100755
index 6f5103c..0000000
--- a/liveengine/bin/data/crests.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Crests">
- <svglayer note="36" file="crests/AD003707.WMF.svg"/>
- <svglayer note="37" file="crests/AG000251.WMF.svg"/>
- <svglayer note="38" file="crests/AG000253.WMF.svg"/>
- <svglayer note="39" file="crests/AG000254.WMF.svg"/>
- <svglayer note="40" file="crests/AG000263.WMF.svg"/>
- <svglayer note="41" file="crests/AG000265.WMF.svg"/>
- <svglayer note="42" file="crests/AG000271.WMF.svg"/>
- <svglayer note="43" file="crests/AG000599.WMF.svg"/>
- <svglayer note="44" file="crests/AG000600.WMF.svg"/>
- <svglayer note="45" file="crests/BCKMC055.WMF.svg"/>
- <svglayer note="46" file="crests/CCM00607.WMF.svg"/>
- <svglayer note="47" file="crests/CCM00612.WMF.svg"/>
- <svglayer note="48" file="crests/CREST003.WMF.svg"/>
- <svglayer note="49" file="crests/CREST004.WMF.svg"/>
- <svglayer note="50" file="crests/CREST005.WMF.svg"/>
- <svglayer note="51" file="crests/CREST006.WMF.svg"/>
- <svglayer note="52" file="crests/CREST009.WMF.svg"/>
- <svglayer note="53" file="crests/DSGNC050.WMF.svg"/>
- <svglayer note="54" file="crests/DSGNC098.WMF.svg"/>
- <svglayer note="55" file="crests/DSGNC181.WMF.svg"/>
- <svglayer note="56" file="crests/DSGNN037.WMF.svg"/>
- <svglayer note="57" file="crests/DSGNN093.WMF.svg"/>
- <svglayer note="58" file="crests/DSGNN103.WMF.svg"/>
- <svglayer note="59" file="crests/EG_DEMI3.WMF.svg"/>
- <svglayer note="60" file="crests/EG_HEAD.WMF.svg"/>
- <svglayer note="61" file="crests/EG_HEAD4.WMF.svg"/>
- <svglayer note="62" file="crests/NA0425.WMF.svg"/>
- <svglayer note="63" file="crests/NA0426.WMF.svg"/>
- <svglayer note="64" file="crests/NA0427.WMF.svg"/>
- <svglayer note="65" file="crests/NA0428.WMF.svg"/>
- <svglayer note="66" file="crests/NA0429.WMF.svg"/>
- <svglayer note="67" file="crests/NA0430.WMF.svg"/>
- <svglayer note="68" file="crests/NA0431.WMF.svg"/>
- <svglayer note="69" file="crests/NA0432.WMF.svg"/>
- <svglayer note="70" file="crests/NA0433.WMF.svg"/>
- <svglayer note="71" file="crests/NA0434.WMF.svg"/>
- <svglayer note="72" file="crests/NA0435.WMF.svg"/>
- <svglayer note="73" file="crests/NA0436.WMF.svg"/>
- <svglayer note="74" file="crests/NA0437.WMF.svg"/>
- <svglayer note="75" file="crests/NA0438.WMF.svg"/>
- <svglayer note="76" file="crests/NA0439.WMF.svg"/>
- <svglayer note="77" file="crests/NA0440.WMF.svg"/>
- <svglayer note="78" file="crests/SIL_FLR2.WMF.svg"/>
- <svglayer note="79" file="crests/SIL_FLR3.WMF.svg"/>
- <svglayer note="80" file="crests/SWORDSHI.WMF.svg"/>
- <svglayer note="81" file="crests/SYMBL44.WMF.svg"/>
- <svglayer note="82" file="crests/agnew.WMF.svg"/>
- <svglayer note="83" file="crests/anderson.WMF.svg"/>
- <svglayer note="84" file="crests/andrews.WMF.svg"/>
- <svglayer note="85" file="crests/armstr44.WMF.svg"/>
- <svglayer note="86" file="crests/arnold.WMF.svg"/>
- <svglayer note="87" file="crests/arthur.WMF.svg"/>
- <svglayer note="88" file="crests/arundell.WMF.svg"/>
- <svglayer note="89" file="crests/ashby.WMF.svg"/>
- <svglayer note="90" file="crests/ashfield.WMF.svg"/>
- <svglayer note="91" file="crests/baillie.WMF.svg"/>
- <svglayer note="92" file="crests/baldwin.WMF.svg"/>
- <svglayer note="93" file="crests/ball.WMF.svg"/>
- <svglayer note="94" file="crests/bane.WMF.svg"/>
- <svglayer note="95" file="crests/banester.WMF.svg"/>
- <svglayer note="96" file="crests/bankes.WMF.svg"/>
- <svglayer note="97" file="crests/barclay.WMF.svg"/>
- <svglayer note="98" file="crests/baxter.WMF.svg"/>
- <svglayer note="99" file="crests/bayley.WMF.svg"/>
- <svglayer note="100" file="crests/baynard.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/cricket.xml b/liveengine/bin/data/cricket.xml
deleted file mode 100755
index b6f1123..0000000
--- a/liveengine/bin/data/cricket.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Cricket">
- <svglayer note="36" file="cricket/CRICK006.WMF.svg"/>
- <svglayer note="37" file="cricket/CRICK008.WMF.svg"/>
- <svglayer note="38" file="cricket/CRICK009.WMF.svg"/>
- <svglayer note="39" file="cricket/CRICK010.WMF.svg"/>
- <svglayer note="40" file="cricket/CRICK011.WMF.svg"/>
- <svglayer note="41" file="cricket/CRICK012.WMF.svg"/>
- <svglayer note="42" file="cricket/CRICK013.WMF.svg"/>
- <svglayer note="43" file="cricket/CRICK014.WMF.svg"/>
- <svglayer note="44" file="cricket/CRICK015.WMF.svg"/>
- <svglayer note="45" file="cricket/CRICK016.WMF.svg"/>
- <svglayer note="46" file="cricket/CRICK017.WMF.svg"/>
- <svglayer note="47" file="cricket/CRICK018.WMF.svg"/>
- <svglayer note="48" file="cricket/CRICK019.WMF.svg"/>
- <svglayer note="49" file="cricket/CRICK020.WMF.svg"/>
- <svglayer note="50" file="cricket/CRICK021.WMF.svg"/>
- <svglayer note="51" file="cricket/CRICK022.WMF.svg"/>
- <svglayer note="52" file="cricket/CRICK023.WMF.svg"/>
- <svglayer note="53" file="cricket/CRICK024.WMF.svg"/>
- <svglayer note="54" file="cricket/CRICK025.WMF.svg"/>
- <svglayer note="55" file="cricket/CRICK026.WMF.svg"/>
- <svglayer note="56" file="cricket/CRICK027.WMF.svg"/>
- <svglayer note="57" file="cricket/CRICK028.WMF.svg"/>
- <svglayer note="58" file="cricket/CRICK032.WMF.svg"/>
- <svglayer note="59" file="cricket/CRICK033.WMF.svg"/>
- <svglayer note="60" file="cricket/CRICKET.WMF.svg"/>
- <svglayer note="61" file="cricket/CROQUET.WMF.svg"/>
- <svglayer note="62" file="cricket/CTCH_UMP.WMF.svg"/>
- <svglayer note="63" file="cricket/CYCLING.WMF.svg"/>
- <svglayer note="64" file="cricket/DRIBBLER.WMF.svg"/>
- <svglayer note="65" file="cricket/FHOCK001.WMF.svg"/>
- <svglayer note="66" file="cricket/FHOCK002.WMF.svg"/>
- <svglayer note="67" file="cricket/FHOCK006.WMF.svg"/>
- <svglayer note="68" file="cricket/FHOCK007.WMF.svg"/>
- <svglayer note="69" file="cricket/FHOCK008.WMF.svg"/>
- <svglayer note="70" file="cricket/FHOCK009.WMF.svg"/>
- <svglayer note="71" file="cricket/FHOCK010.WMF.svg"/>
- <svglayer note="72" file="cricket/FHOCK011.WMF.svg"/>
- <svglayer note="73" file="cricket/FHOCK012.WMF.svg"/>
- <svglayer note="74" file="cricket/FHOCK013.WMF.svg"/>
- <svglayer note="75" file="cricket/CRICK006.WMF.svg"/>
- <svglayer note="76" file="cricket/CRICK008.WMF.svg"/>
- <svglayer note="77" file="cricket/CRICK009.WMF.svg"/>
- <svglayer note="78" file="cricket/CRICK010.WMF.svg"/>
- <svglayer note="79" file="cricket/CRICK011.WMF.svg"/>
- <svglayer note="80" file="cricket/CRICK012.WMF.svg"/>
- <svglayer note="81" file="cricket/CRICK013.WMF.svg"/>
- <svglayer note="82" file="cricket/CRICK014.WMF.svg"/>
- <svglayer note="83" file="cricket/CRICK015.WMF.svg"/>
- <svglayer note="84" file="cricket/CRICK016.WMF.svg"/>
- <svglayer note="85" file="cricket/CRICK017.WMF.svg"/>
- <svglayer note="86" file="cricket/CRICK018.WMF.svg"/>
- <svglayer note="87" file="cricket/CRICK019.WMF.svg"/>
- <svglayer note="88" file="cricket/CRICK020.WMF.svg"/>
- <svglayer note="89" file="cricket/CRICK021.WMF.svg"/>
- <svglayer note="90" file="cricket/CRICK022.WMF.svg"/>
- <svglayer note="91" file="cricket/CRICK023.WMF.svg"/>
- <svglayer note="92" file="cricket/CRICK024.WMF.svg"/>
- <svglayer note="93" file="cricket/CRICK025.WMF.svg"/>
- <svglayer note="94" file="cricket/CRICK026.WMF.svg"/>
- <svglayer note="95" file="cricket/CRICK027.WMF.svg"/>
- <svglayer note="96" file="cricket/CRICK028.WMF.svg"/>
- <svglayer note="97" file="cricket/CRICK032.WMF.svg"/>
- <svglayer note="98" file="cricket/CRICK033.WMF.svg"/>
- <svglayer note="99" file="cricket/CRICKET.WMF.svg"/>
- <svglayer note="100" file="cricket/CROQUET.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/dancing.xml b/liveengine/bin/data/dancing.xml
deleted file mode 100755
index 74901dd..0000000
--- a/liveengine/bin/data/dancing.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Dancing">
- <svglayer note="36" file="dancing/LJ01542A.WMF.svg"/>
- <svglayer note="37" file="dancing/LJ01543A.WMF.svg"/>
- <svglayer note="38" file="dancing/LJ01544A.WMF.svg"/>
- <svglayer note="39" file="dancing/LJ01545A.WMF.svg"/>
- <svglayer note="40" file="dancing/LJ01546A.WMF.svg"/>
- <svglayer note="41" file="dancing/LJ01551A.WMF.svg"/>
- <svglayer note="42" file="dancing/LJ01557A.WMF.svg"/>
- <svglayer note="43" file="dancing/LJ01558A.WMF.svg"/>
- <svglayer note="44" file="dancing/LJ01559A.WMF.svg"/>
- <svglayer note="45" file="dancing/LJ01560A.WMF.svg"/>
- <svglayer note="46" file="dancing/LJ01567A.WMF.svg"/>
- <svglayer note="47" file="dancing/LJ01569A.WMF.svg"/>
- <svglayer note="48" file="dancing/LJ01584A.WMF.svg"/>
- <svglayer note="49" file="dancing/LJ01595A.WMF.svg"/>
- <svglayer note="50" file="dancing/LJ01596A.WMF.svg"/>
- <svglayer note="51" file="dancing/LJ01598A.WMF.svg"/>
- <svglayer note="52" file="dancing/LJ01604A.WMF.svg"/>
- <svglayer note="53" file="dancing/LJ01698A.WMF.svg"/>
- <svglayer note="54" file="dancing/LJ01699A.WMF.svg"/>
- <svglayer note="55" file="dancing/LJ01700A.WMF.svg"/>
- <svglayer note="56" file="dancing/LJ01701A.WMF.svg"/>
- <svglayer note="57" file="dancing/LJ01702A.WMF.svg"/>
- <svglayer note="58" file="dancing/LJ01712A.WMF.svg"/>
- <svglayer note="59" file="dancing/LJ01542A.WMF.svg"/>
- <svglayer note="60" file="dancing/LJ01543A.WMF.svg"/>
- <svglayer note="61" file="dancing/LJ01544A.WMF.svg"/>
- <svglayer note="62" file="dancing/LJ01545A.WMF.svg"/>
- <svglayer note="63" file="dancing/LJ01546A.WMF.svg"/>
- <svglayer note="64" file="dancing/LJ01551A.WMF.svg"/>
- <svglayer note="65" file="dancing/LJ01557A.WMF.svg"/>
- <svglayer note="66" file="dancing/LJ01558A.WMF.svg"/>
- <svglayer note="67" file="dancing/LJ01559A.WMF.svg"/>
- <svglayer note="68" file="dancing/LJ01560A.WMF.svg"/>
- <svglayer note="69" file="dancing/LJ01567A.WMF.svg"/>
- <svglayer note="70" file="dancing/LJ01569A.WMF.svg"/>
- <svglayer note="71" file="dancing/LJ01584A.WMF.svg"/>
- <svglayer note="72" file="dancing/LJ01595A.WMF.svg"/>
- <svglayer note="73" file="dancing/LJ01596A.WMF.svg"/>
- <svglayer note="74" file="dancing/LJ01598A.WMF.svg"/>
- <svglayer note="75" file="dancing/LJ01604A.WMF.svg"/>
- <svglayer note="76" file="dancing/LJ01698A.WMF.svg"/>
- <svglayer note="77" file="dancing/LJ01699A.WMF.svg"/>
- <svglayer note="78" file="dancing/LJ01700A.WMF.svg"/>
- <svglayer note="79" file="dancing/LJ01701A.WMF.svg"/>
- <svglayer note="80" file="dancing/LJ01702A.WMF.svg"/>
- <svglayer note="81" file="dancing/LJ01712A.WMF.svg"/>
- <svglayer note="82" file="dancing/LJ01542A.WMF.svg"/>
- <svglayer note="83" file="dancing/LJ01543A.WMF.svg"/>
- <svglayer note="84" file="dancing/LJ01544A.WMF.svg"/>
- <svglayer note="85" file="dancing/LJ01545A.WMF.svg"/>
- <svglayer note="86" file="dancing/LJ01546A.WMF.svg"/>
- <svglayer note="87" file="dancing/LJ01551A.WMF.svg"/>
- <svglayer note="88" file="dancing/LJ01557A.WMF.svg"/>
- <svglayer note="89" file="dancing/LJ01558A.WMF.svg"/>
- <svglayer note="90" file="dancing/LJ01559A.WMF.svg"/>
- <svglayer note="91" file="dancing/LJ01560A.WMF.svg"/>
- <svglayer note="92" file="dancing/LJ01567A.WMF.svg"/>
- <svglayer note="93" file="dancing/LJ01569A.WMF.svg"/>
- <svglayer note="94" file="dancing/LJ01584A.WMF.svg"/>
- <svglayer note="95" file="dancing/LJ01595A.WMF.svg"/>
- <svglayer note="96" file="dancing/LJ01596A.WMF.svg"/>
- <svglayer note="97" file="dancing/LJ01598A.WMF.svg"/>
- <svglayer note="98" file="dancing/LJ01604A.WMF.svg"/>
- <svglayer note="99" file="dancing/LJ01698A.WMF.svg"/>
- <svglayer note="100" file="dancing/LJ01699A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/food.xml b/liveengine/bin/data/food.xml
deleted file mode 100755
index 44c1514..0000000
--- a/liveengine/bin/data/food.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Food">
- <svglayer note="36" file="food/E01003B.WMF.svg"/>
- <svglayer note="37" file="food/E01006B.WMF.svg"/>
- <svglayer note="38" file="food/E01007C.WMF.svg"/>
- <svglayer note="39" file="food/E01008C.WMF.svg"/>
- <svglayer note="40" file="food/E01009C.WMF.svg"/>
- <svglayer note="41" file="food/E01030B.WMF.svg"/>
- <svglayer note="42" file="food/E01031B.WMF.svg"/>
- <svglayer note="43" file="food/E01032B.WMF.svg"/>
- <svglayer note="44" file="food/E01033B.WMF.svg"/>
- <svglayer note="45" file="food/E01034B.WMF.svg"/>
- <svglayer note="46" file="food/E01035C.WMF.svg"/>
- <svglayer note="47" file="food/E01036B.WMF.svg"/>
- <svglayer note="48" file="food/E01037B.WMF.svg"/>
- <svglayer note="49" file="food/E01038B.WMF.svg"/>
- <svglayer note="50" file="food/E01039B.WMF.svg"/>
- <svglayer note="51" file="food/E01040B.WMF.svg"/>
- <svglayer note="52" file="food/E01041B.WMF.svg"/>
- <svglayer note="53" file="food/E01042C.WMF.svg"/>
- <svglayer note="54" file="food/E01043C.WMF.svg"/>
- <svglayer note="55" file="food/E01044B.WMF.svg"/>
- <svglayer note="56" file="food/E01045B.WMF.svg"/>
- <svglayer note="57" file="food/E01046B.WMF.svg"/>
- <svglayer note="58" file="food/E01047B.WMF.svg"/>
- <svglayer note="59" file="food/E01048B.WMF.svg"/>
- <svglayer note="60" file="food/E01049C.WMF.svg"/>
- <svglayer note="61" file="food/E01050B.WMF.svg"/>
- <svglayer note="62" file="food/E01051B.WMF.svg"/>
- <svglayer note="63" file="food/E01052B.WMF.svg"/>
- <svglayer note="64" file="food/E01053B.WMF.svg"/>
- <svglayer note="65" file="food/E01054B.WMF.svg"/>
- <svglayer note="66" file="food/E01055B.WMF.svg"/>
- <svglayer note="67" file="food/E01056B.WMF.svg"/>
- <svglayer note="68" file="food/E01057C.WMF.svg"/>
- <svglayer note="69" file="food/E01058B.WMF.svg"/>
- <svglayer note="70" file="food/E01059B.WMF.svg"/>
- <svglayer note="71" file="food/E01060B.WMF.svg"/>
- <svglayer note="72" file="food/E01061C.WMF.svg"/>
- <svglayer note="73" file="food/E01062C.WMF.svg"/>
- <svglayer note="74" file="food/E01063B.WMF.svg"/>
- <svglayer note="75" file="food/E01064C.WMF.svg"/>
- <svglayer note="76" file="food/E01065B.WMF.svg"/>
- <svglayer note="77" file="food/E01066B.WMF.svg"/>
- <svglayer note="78" file="food/E01067B.WMF.svg"/>
- <svglayer note="79" file="food/E01068B.WMF.svg"/>
- <svglayer note="80" file="food/E01069B.WMF.svg"/>
- <svglayer note="81" file="food/E01070C.WMF.svg"/>
- <svglayer note="82" file="food/E06012C.WMF.svg"/>
- <svglayer note="83" file="food/E06025B.WMF.svg"/>
- <svglayer note="84" file="food/FD001348.WMF.svg"/>
- <svglayer note="85" file="food/FD001349.WMF.svg"/>
- <svglayer note="86" file="food/FD001350.WMF.svg"/>
- <svglayer note="87" file="food/FD001351.WMF.svg"/>
- <svglayer note="88" file="food/FD001352.WMF.svg"/>
- <svglayer note="89" file="food/FD001353.WMF.svg"/>
- <svglayer note="90" file="food/FD001354.WMF.svg"/>
- <svglayer note="91" file="food/FD001355.WMF.svg"/>
- <svglayer note="92" file="food/FD001356.WMF.svg"/>
- <svglayer note="93" file="food/FD001357.WMF.svg"/>
- <svglayer note="94" file="food/FD001378.WMF.svg"/>
- <svglayer note="95" file="food/FD001394.WMF.svg"/>
- <svglayer note="96" file="food/FD001395.WMF.svg"/>
- <svglayer note="97" file="food/FD001396.WMF.svg"/>
- <svglayer note="98" file="food/FD001397.WMF.svg"/>
- <svglayer note="99" file="food/FD001398.WMF.svg"/>
- <svglayer note="100" file="food/FD001399.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/insects.xml b/liveengine/bin/data/insects.xml
deleted file mode 100755
index 0d78831..0000000
--- a/liveengine/bin/data/insects.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<playlist name="insects">
- <svglayer note="64" file="insects/Ag01036x.wmf.svg"/>
- <svglayer note="44" file="insects/Bit1139.wmf.svg"/>
- <svglayer note="69" file="insects/MMA00001.wmf.svg"/>
- <svglayer note="90" file="insects/MMA00002.wmf.svg"/>
- <svglayer note="98" file="insects/MMA00003.wmf.svg"/>
- <svglayer note="93" file="insects/MMA00004.wmf.svg"/>
- <svglayer note="52" file="insects/MMA00005.wmf.svg"/>
- <svglayer note="41" file="insects/MMA00006.wmf.svg"/>
- <svglayer note="40" file="insects/MMA00007.wmf.svg"/>
- <svglayer note="59" file="insects/MMA00008.wmf.svg"/>
- <svglayer note="86" file="insects/MMA00009.wmf.svg"/>
- <svglayer note="54" file="insects/MMA00010.wmf.svg"/>
- <svglayer note="91" file="insects/MMA00011.wmf.svg"/>
- <svglayer note="53" file="insects/MMA00012.wmf.svg"/>
- <svglayer note="99" file="insects/MMA00013.wmf.svg"/>
- <svglayer note="68" file="insects/MMA00014.wmf.svg"/>
- <svglayer note="81" file="insects/MMA00015.wmf.svg"/>
- <svglayer note="63" file="insects/MMA00016.wmf.svg"/>
- <svglayer note="62" file="insects/MMA00017.wmf.svg"/>
- <svglayer note="49" file="insects/MMA00018.wmf.svg"/>
- <svglayer note="43" file="insects/MMA00019.wmf.svg"/>
- <svglayer note="36" file="insects/MMA00020.wmf.svg"/>
- <svglayer note="97" file="insects/MMA00021.wmf.svg"/>
- <svglayer note="72" file="insects/MMA00022.wmf.svg"/>
- <svglayer note="94" file="insects/MMA00023.wmf.svg"/>
- <svglayer note="45" file="insects/MMA00024.wmf.svg"/>
- <svglayer note="37" file="insects/MMA00025.wmf.svg"/>
- <svglayer note="48" file="insects/MMA00026.wmf.svg"/>
- <svglayer note="38" file="insects/MMA00027.wmf.svg"/>
- <svglayer note="76" file="insects/MMA00028.wmf.svg"/>
- <svglayer note="95" file="insects/MMA00029.wmf.svg"/>
- <svglayer note="89" file="insects/MMA00030.wmf.svg"/>
- <svglayer note="80" file="insects/MMA00031.wmf.svg"/>
- <svglayer note="46" file="insects/MMA00032.wmf.svg"/>
- <svglayer note="61" file="insects/MMA00033.wmf.svg"/>
- <svglayer note="85" file="insects/MMA00034.wmf.svg"/>
- <svglayer note="66" file="insects/MMA00035.wmf.svg"/>
- <svglayer note="82" file="insects/MMA00036.wmf.svg"/>
- <svglayer note="50" file="insects/MMA00037.wmf.svg"/>
- <svglayer note="96" file="insects/MMA00038.wmf.svg"/>
- <svglayer note="84" file="insects/MMA00039.wmf.svg"/>
- <svglayer note="56" file="insects/MMA00040.wmf.svg"/>
- <svglayer note="42" file="insects/MMA00041.wmf.svg"/>
- <svglayer note="70" file="insects/MMA00042.wmf.svg"/>
- <svglayer note="47" file="insects/MMA00043.wmf.svg"/>
- <svglayer note="73" file="insects/MMA00044.wmf.svg"/>
- <svglayer note="60" file="insects/MMA00045.wmf.svg"/>
- <svglayer note="65" file="insects/MMA00046.wmf.svg"/>
- <svglayer note="58" file="insects/MMA00047.wmf.svg"/>
- <svglayer note="74" file="insects/MMA00048.wmf.svg"/>
- <svglayer note="83" file="insects/MMA00049.wmf.svg"/>
- <svglayer note="77" file="insects/MMA00050.wmf.svg"/>
- <svglayer note="57" file="insects/MMA00051.wmf.svg"/>
- <svglayer note="71" file="insects/MMA00052.wmf.svg"/>
- <svglayer note="75" file="insects/ag01501a.wmf.svg"/>
- <svglayer note="88" file="insects/ag01502a.wmf.svg"/>
- <svglayer note="39" file="insects/ag01503a.wmf.svg"/>
- <svglayer note="67" file="insects/ag01506a.wmf.svg"/>
- <svglayer note="92" file="insects/ag35003b.wmf.svg"/>
- <svglayer note="87" file="insects/ag35004b.wmf.svg"/>
- <svglayer note="51" file="insects/Ag01036x.wmf.svg"/>
- <svglayer note="78" file="insects/Bit1139.wmf.svg"/>
- <svglayer note="79" file="insects/MMA00001.wmf.svg"/>
- <svglayer note="55" file="insects/MMA00002.wmf.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/knights.xml b/liveengine/bin/data/knights.xml
deleted file mode 100755
index 3b4d5f1..0000000
--- a/liveengine/bin/data/knights.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<playlist>
- <svglayer note="36" file="mil_knights/knight08.WMF.svg"/>
- <svglayer note="37" file="mil_knights/knight09.WMF.svg"/>
- <svglayer note="38" file="mil_knights/knight10.WMF.svg"/>
- <svglayer note="39" file="mil_knights/knight11.WMF.svg"/>
- <svglayer note="40" file="mil_knights/knight12.WMF.svg"/>
- <svglayer note="41" file="mil_knights/knight13.WMF.svg"/>
- <svglayer note="42" file="mil_knights/knight14.WMF.svg"/>
- <svglayer note="43" file="mil_knights/knight15.WMF.svg"/>
- <svglayer note="44" file="mil_knights/knight16.WMF.svg"/>
- <svglayer note="45" file="mil_knights/knight17.WMF.svg"/>
- <svglayer note="46" file="mil_knights/knight18.WMF.svg"/>
- <svglayer note="47" file="mil_knights/knight19.WMF.svg"/>
- <svglayer note="48" file="mil_knights/knight20.WMF.svg"/>
- <svglayer note="49" file="mil_knights/knight21.WMF.svg"/>
- <svglayer note="50" file="mil_knights/knight22.WMF.svg"/>
- <svglayer note="51" file="mil_knights/knight23.WMF.svg"/>
- <svglayer note="52" file="mil_knights/knight24.WMF.svg"/>
- <svglayer note="53" file="mil_knights/knight25.WMF.svg"/>
- <svglayer note="54" file="mil_knights/knight26.WMF.svg"/>
- <svglayer note="55" file="mil_knights/knight27.WMF.svg"/>
- <svglayer note="56" file="mil_knights/knight28.WMF.svg"/>
- <svglayer note="57" file="mil_knights/knight29.WMF.svg"/>
- <svglayer note="58" file="mil_knights/knight30.WMF.svg"/>
- <svglayer note="59" file="mil_knights/knight31.WMF.svg"/>
- <svglayer note="60" file="mil_knights/knight32.WMF.svg"/>
- <svglayer note="61" file="mil_knights/knight33.WMF.svg"/>
- <svglayer note="62" file="mil_knights/knight34.WMF.svg"/>
- <svglayer note="63" file="mil_knights/knight35.WMF.svg"/>
- <svglayer note="64" file="mil_knights/knight36.WMF.svg"/>
- <svglayer note="65" file="mil_knights/knight37.WMF.svg"/>
-
- <svglayer note="67" file="mil_knights/knight39.WMF.svg"/>
- <svglayer note="68" file="mil_knights/knight40.WMF.svg"/>
- <svglayer note="69" file="mil_knights/knight41.WMF.svg"/>
- <svglayer note="70" file="mil_knights/knight42.WMF.svg"/>
- <svglayer note="71" file="mil_knights/knight43.WMF.svg"/>
- <svglayer note="72" file="mil_knights/knight44.WMF.svg"/>
- <svglayer note="73" file="mil_knights/knight45.WMF.svg"/>
- <svglayer note="74" file="mil_knights/knight46.WMF.svg"/>
- <svglayer note="75" file="mil_knights/knight47.WMF.svg"/>
- <svglayer note="76" file="mil_knights/knight48.WMF.svg"/>
- <svglayer note="77" file="mil_knights/knight49.WMF.svg"/>
- <svglayer note="78" file="mil_knights/knight50.WMF.svg"/>
- <svglayer note="79" file="mil_knights/knight51.WMF.svg"/>
- <svglayer note="80" file="mil_knights/knight52.WMF.svg"/>
- <svglayer note="81" file="mil_knights/knight53.WMF.svg"/>
- <svglayer note="82" file="mil_knights/knight54.WMF.svg"/>
- <svglayer note="83" file="mil_knights/knight55.WMF.svg"/>
- <svglayer note="84" file="mil_knights/knight56.WMF.svg"/>
- <svglayer note="85" file="mil_knights/knight57.WMF.svg"/>
- <svglayer note="86" file="mil_knights/knight58.WMF.svg"/>
-
-</playlist>
-
diff --git a/liveengine/bin/data/makeplaylist.py b/liveengine/bin/data/makeplaylist.py
deleted file mode 100755
index 2376f3d..0000000
--- a/liveengine/bin/data/makeplaylist.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/python
-
-from lxml import etree
-import sys,os,random
-
-if len(sys.argv)<2:
- print "usage: makeplaylist source_directory playlist_name"
- sys.exit(0)
-
-sourcedir=sys.argv[1]
-playlistname=sys.argv[1]
-
-if len(sys.argv)>2:
- playlistname=sys.argv[2]
-
-page = etree.Element('playlist',name=playlistname)
-doc = etree.ElementTree(page)
-
-dirList=sorted(os.listdir(sourcedir))
-nums=range(64)
-random.shuffle(nums)
-note = 0
-while note<64:
- for fname in dirList:
- pageElement = etree.SubElement(page, 'svglayer',
- note=str(nums[note]+36),
- file=sourcedir+"/"+fname)
- note +=1
- if note>63:
- break
-
-file= open(sourcedir+".xml", "w")
-doc.write(file, xml_declaration=True, encoding='utf-8',pretty_print=True)
-file.close() \ No newline at end of file
diff --git a/liveengine/bin/data/mil_historic.xml b/liveengine/bin/data/mil_historic.xml
deleted file mode 100755
index 20101c3..0000000
--- a/liveengine/bin/data/mil_historic.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Historic Military">
- <svglayer note="36" file="mil_historic/LD01187A.WMF.svg"/>
- <svglayer note="37" file="mil_historic/LD01196A.WMF.svg"/>
- <svglayer note="38" file="mil_historic/LD01225A.WMF.svg"/>
- <svglayer note="39" file="mil_historic/LD01226A.WMF.svg"/>
- <svglayer note="40" file="mil_historic/LD01228A.WMF.svg"/>
- <svglayer note="41" file="mil_historic/LD01229A.WMF.svg"/>
- <svglayer note="42" file="mil_historic/LD01230A.WMF.svg"/>
- <svglayer note="43" file="mil_historic/LD01231A.WMF.svg"/>
- <svglayer note="44" file="mil_historic/LD01232A.WMF.svg"/>
- <svglayer note="45" file="mil_historic/LD01233A.WMF.svg"/>
- <svglayer note="46" file="mil_historic/LD01234A.WMF.svg"/>
- <svglayer note="47" file="mil_historic/LD01235A.WMF.svg"/>
- <svglayer note="48" file="mil_historic/LD01236A.WMF.svg"/>
- <svglayer note="49" file="mil_historic/LD01237A.WMF.svg"/>
- <svglayer note="50" file="mil_historic/LD01238A.WMF.svg"/>
- <svglayer note="51" file="mil_historic/LD01239A.WMF.svg"/>
- <svglayer note="52" file="mil_historic/LD01243A.WMF.svg"/>
- <svglayer note="53" file="mil_historic/LD01244A.WMF.svg"/>
- <svglayer note="54" file="mil_historic/LD01246A.WMF.svg"/>
- <svglayer note="55" file="mil_historic/LD01248A.WMF.svg"/>
- <svglayer note="56" file="mil_historic/LD01258A.WMF.svg"/>
- <svglayer note="57" file="mil_historic/LD01263A.WMF.svg"/>
- <svglayer note="58" file="mil_historic/LD01265A.WMF.svg"/>
- <svglayer note="59" file="mil_historic/LD01268A.WMF.svg"/>
- <svglayer note="60" file="mil_historic/LD01273A.WMF.svg"/>
- <svglayer note="61" file="mil_historic/LD01274A.WMF.svg"/>
- <svglayer note="62" file="mil_historic/LD01277A.WMF.svg"/>
- <svglayer note="63" file="mil_historic/LD01278A.WMF.svg"/>
- <svglayer note="64" file="mil_historic/LD01279A.WMF.svg"/>
- <svglayer note="65" file="mil_historic/LD01283A.WMF.svg"/>
- <svglayer note="66" file="mil_historic/LD01286A.WMF.svg"/>
- <svglayer note="67" file="mil_historic/LD01287A.WMF.svg"/>
- <svglayer note="68" file="mil_historic/LD01301A.WMF.svg"/>
- <svglayer note="69" file="mil_historic/LD01351A.WMF.svg"/>
- <svglayer note="70" file="mil_historic/LD01359A.WMF.svg"/>
- <svglayer note="71" file="mil_historic/LD01360A.WMF.svg"/>
- <svglayer note="72" file="mil_historic/LD01364A.WMF.svg"/>
- <svglayer note="73" file="mil_historic/LD01365A.WMF.svg"/>
- <svglayer note="74" file="mil_historic/LD01366A.WMF.svg"/>
- <svglayer note="75" file="mil_historic/LD01367A.WMF.svg"/>
- <svglayer note="76" file="mil_historic/LD01378A.WMF.svg"/>
- <svglayer note="77" file="mil_historic/LD01380A.WMF.svg"/>
- <svglayer note="78" file="mil_historic/LD01381A.WMF.svg"/>
- <svglayer note="79" file="mil_historic/LD01385A.WMF.svg"/>
- <svglayer note="80" file="mil_historic/LD01388A.WMF.svg"/>
- <svglayer note="81" file="mil_historic/LD01389A.WMF.svg"/>
- <svglayer note="82" file="mil_historic/LD01392A.WMF.svg"/>
- <svglayer note="83" file="mil_historic/LD01395A.WMF.svg"/>
- <svglayer note="84" file="mil_historic/LD01397A.WMF.svg"/>
- <svglayer note="85" file="mil_historic/LD15002A.WMF.svg"/>
- <svglayer note="86" file="mil_historic/LD15003A.WMF.svg"/>
- <svglayer note="87" file="mil_historic/LD15004A.WMF.svg"/>
- <svglayer note="88" file="mil_historic/LD15005A.WMF.svg"/>
- <svglayer note="89" file="mil_historic/LD15006A.WMF.svg"/>
- <svglayer note="90" file="mil_historic/LD15007A.WMF.svg"/>
- <svglayer note="91" file="mil_historic/LD15008A.WMF.svg"/>
- <svglayer note="92" file="mil_historic/LD15009A.WMF.svg"/>
- <svglayer note="93" file="mil_historic/LD15010A.WMF.svg"/>
- <svglayer note="94" file="mil_historic/LD15014A.WMF.svg"/>
- <svglayer note="95" file="mil_historic/LD15018A.WMF.svg"/>
- <svglayer note="96" file="mil_historic/LD15019A.WMF.svg"/>
- <svglayer note="97" file="mil_historic/LD15020A.WMF.svg"/>
- <svglayer note="98" file="mil_historic/LD15021A.WMF.svg"/>
- <svglayer note="99" file="mil_historic/LD15022A.WMF.svg"/>
- <svglayer note="100" file="mil_historic/LD15023A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/military_ethnic.xml b/liveengine/bin/data/military_ethnic.xml
deleted file mode 100755
index 01486b8..0000000
--- a/liveengine/bin/data/military_ethnic.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Ethnic Military">
- <svglayer note="36" file="military_ethnic/NA01408A.WMF.svg"/>
- <svglayer note="37" file="military_ethnic/NA01419A.WMF.svg"/>
- <svglayer note="38" file="military_ethnic/NA01422A.WMF.svg"/>
- <svglayer note="39" file="military_ethnic/NA09022B.WMF.svg"/>
- <svglayer note="40" file="military_ethnic/NAVY1.WMF.svg"/>
- <svglayer note="41" file="military_ethnic/NC01217A.WMF.svg"/>
- <svglayer note="42" file="military_ethnic/ND01386A.WMF.svg"/>
- <svglayer note="43" file="military_ethnic/ND01443A.WMF.svg"/>
- <svglayer note="44" file="military_ethnic/ND01487A.WMF.svg"/>
- <svglayer note="45" file="military_ethnic/ND01488A.WMF.svg"/>
- <svglayer note="46" file="military_ethnic/ND01713A.WMF.svg"/>
- <svglayer note="47" file="military_ethnic/ND01724A.WMF.svg"/>
- <svglayer note="48" file="military_ethnic/ND01730A.WMF.svg"/>
- <svglayer note="49" file="military_ethnic/ND01834A.WMF.svg"/>
- <svglayer note="50" file="military_ethnic/ND01835A.WMF.svg"/>
- <svglayer note="51" file="military_ethnic/ND01837A.WMF.svg"/>
- <svglayer note="52" file="military_ethnic/NE01068A.WMF.svg"/>
- <svglayer note="53" file="military_ethnic/NE15015A.WMF.svg"/>
- <svglayer note="54" file="military_ethnic/NF15006A.WMF.svg"/>
- <svglayer note="55" file="military_ethnic/NA01408A.WMF.svg"/>
- <svglayer note="56" file="military_ethnic/NA01419A.WMF.svg"/>
- <svglayer note="57" file="military_ethnic/NA01422A.WMF.svg"/>
- <svglayer note="58" file="military_ethnic/NA09022B.WMF.svg"/>
- <svglayer note="59" file="military_ethnic/NAVY1.WMF.svg"/>
- <svglayer note="60" file="military_ethnic/NC01217A.WMF.svg"/>
- <svglayer note="61" file="military_ethnic/ND01386A.WMF.svg"/>
- <svglayer note="62" file="military_ethnic/ND01443A.WMF.svg"/>
- <svglayer note="63" file="military_ethnic/ND01487A.WMF.svg"/>
- <svglayer note="64" file="military_ethnic/ND01488A.WMF.svg"/>
- <svglayer note="65" file="military_ethnic/ND01713A.WMF.svg"/>
- <svglayer note="66" file="military_ethnic/ND01724A.WMF.svg"/>
- <svglayer note="67" file="military_ethnic/ND01730A.WMF.svg"/>
- <svglayer note="68" file="military_ethnic/ND01834A.WMF.svg"/>
- <svglayer note="69" file="military_ethnic/ND01835A.WMF.svg"/>
- <svglayer note="70" file="military_ethnic/ND01837A.WMF.svg"/>
- <svglayer note="71" file="military_ethnic/NE01068A.WMF.svg"/>
- <svglayer note="72" file="military_ethnic/NE15015A.WMF.svg"/>
- <svglayer note="73" file="military_ethnic/NF15006A.WMF.svg"/>
- <svglayer note="74" file="military_ethnic/NA01408A.WMF.svg"/>
- <svglayer note="75" file="military_ethnic/NA01419A.WMF.svg"/>
- <svglayer note="76" file="military_ethnic/NA01422A.WMF.svg"/>
- <svglayer note="77" file="military_ethnic/NA09022B.WMF.svg"/>
- <svglayer note="78" file="military_ethnic/NAVY1.WMF.svg"/>
- <svglayer note="79" file="military_ethnic/NC01217A.WMF.svg"/>
- <svglayer note="80" file="military_ethnic/ND01386A.WMF.svg"/>
- <svglayer note="81" file="military_ethnic/ND01443A.WMF.svg"/>
- <svglayer note="82" file="military_ethnic/ND01487A.WMF.svg"/>
- <svglayer note="83" file="military_ethnic/ND01488A.WMF.svg"/>
- <svglayer note="84" file="military_ethnic/ND01713A.WMF.svg"/>
- <svglayer note="85" file="military_ethnic/ND01724A.WMF.svg"/>
- <svglayer note="86" file="military_ethnic/ND01730A.WMF.svg"/>
- <svglayer note="87" file="military_ethnic/ND01834A.WMF.svg"/>
- <svglayer note="88" file="military_ethnic/ND01835A.WMF.svg"/>
- <svglayer note="89" file="military_ethnic/ND01837A.WMF.svg"/>
- <svglayer note="90" file="military_ethnic/NE01068A.WMF.svg"/>
- <svglayer note="91" file="military_ethnic/NE15015A.WMF.svg"/>
- <svglayer note="92" file="military_ethnic/NF15006A.WMF.svg"/>
- <svglayer note="93" file="military_ethnic/NA01408A.WMF.svg"/>
- <svglayer note="94" file="military_ethnic/NA01419A.WMF.svg"/>
- <svglayer note="95" file="military_ethnic/NA01422A.WMF.svg"/>
- <svglayer note="96" file="military_ethnic/NA09022B.WMF.svg"/>
- <svglayer note="97" file="military_ethnic/NAVY1.WMF.svg"/>
- <svglayer note="98" file="military_ethnic/NC01217A.WMF.svg"/>
- <svglayer note="99" file="military_ethnic/ND01386A.WMF.svg"/>
- <svglayer note="100" file="military_ethnic/ND01443A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/organs.xml b/liveengine/bin/data/organs.xml
deleted file mode 100755
index 3b1c530..0000000
--- a/liveengine/bin/data/organs.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Organs">
- <svglayer note="36" file="organs/ABS1.WMF.svg"/>
- <svglayer note="37" file="organs/ABS2.WMF.svg"/>
- <svglayer note="38" file="organs/ANATM003.WMF.svg"/>
- <svglayer note="39" file="organs/ANATM009.WMF.svg"/>
- <svglayer note="40" file="organs/ANATM010.WMF.svg"/>
- <svglayer note="41" file="organs/ANATM012.WMF.svg"/>
- <svglayer note="42" file="organs/ANATM015.WMF.svg"/>
- <svglayer note="43" file="organs/ANATM019.WMF.svg"/>
- <svglayer note="44" file="organs/ANATM022.WMF.svg"/>
- <svglayer note="45" file="organs/ANATM045.WMF.svg"/>
- <svglayer note="46" file="organs/ANATM298.WMF.svg"/>
- <svglayer note="47" file="organs/ANATM299.WMF.svg"/>
- <svglayer note="48" file="organs/ANATM300.WMF.svg"/>
- <svglayer note="49" file="organs/ANATM301.WMF.svg"/>
- <svglayer note="50" file="organs/ANATM308.WMF.svg"/>
- <svglayer note="51" file="organs/ANATM310.WMF.svg"/>
- <svglayer note="52" file="organs/ANATM312.WMF.svg"/>
- <svglayer note="53" file="organs/ANATM315.WMF.svg"/>
- <svglayer note="54" file="organs/ANATM317.WMF.svg"/>
- <svglayer note="55" file="organs/ANATM319.WMF.svg"/>
- <svglayer note="56" file="organs/ANATM326.WMF.svg"/>
- <svglayer note="57" file="organs/ANATM327.WMF.svg"/>
- <svglayer note="58" file="organs/ANATM328.WMF.svg"/>
- <svglayer note="59" file="organs/ANATM331.WMF.svg"/>
- <svglayer note="60" file="organs/ANATM332.WMF.svg"/>
- <svglayer note="61" file="organs/ANATM334.WMF.svg"/>
- <svglayer note="62" file="organs/ANATM336.WMF.svg"/>
- <svglayer note="63" file="organs/ANATM337.WMF.svg"/>
- <svglayer note="64" file="organs/ANATM344.WMF.svg"/>
- <svglayer note="65" file="organs/ANATM345.WMF.svg"/>
- <svglayer note="66" file="organs/ANATM346.WMF.svg"/>
- <svglayer note="67" file="organs/ANATM347.WMF.svg"/>
- <svglayer note="68" file="organs/ANATM348.WMF.svg"/>
- <svglayer note="69" file="organs/ANATM352.WMF.svg"/>
- <svglayer note="70" file="organs/ANATM353.WMF.svg"/>
- <svglayer note="71" file="organs/BRAIN.WMF.svg"/>
- <svglayer note="72" file="organs/CCM01347.WMF.svg"/>
- <svglayer note="73" file="organs/CS002161.WMF.svg"/>
- <svglayer note="74" file="organs/CS002162.WMF.svg"/>
- <svglayer note="75" file="organs/CS002164.WMF.svg"/>
- <svglayer note="76" file="organs/CS002165.WMF.svg"/>
- <svglayer note="77" file="organs/CS002166.WMF.svg"/>
- <svglayer note="78" file="organs/CS002183.WMF.svg"/>
- <svglayer note="79" file="organs/CS002189.WMF.svg"/>
- <svglayer note="80" file="organs/CS002190.WMF.svg"/>
- <svglayer note="81" file="organs/CS002191.WMF.svg"/>
- <svglayer note="82" file="organs/CS002193.WMF.svg"/>
- <svglayer note="83" file="organs/CS002201.WMF.svg"/>
- <svglayer note="84" file="organs/CS002202.WMF.svg"/>
- <svglayer note="85" file="organs/CS002205.WMF.svg"/>
- <svglayer note="86" file="organs/CS002207.WMF.svg"/>
- <svglayer note="87" file="organs/CS002208.WMF.svg"/>
- <svglayer note="88" file="organs/CS002209.WMF.svg"/>
- <svglayer note="89" file="organs/CS002210.WMF.svg"/>
- <svglayer note="90" file="organs/CS002214.WMF.svg"/>
- <svglayer note="91" file="organs/CS002223.WMF.svg"/>
- <svglayer note="92" file="organs/CS002225.WMF.svg"/>
- <svglayer note="93" file="organs/CS002227.WMF.svg"/>
- <svglayer note="94" file="organs/CS002229.WMF.svg"/>
- <svglayer note="95" file="organs/CS002237.WMF.svg"/>
- <svglayer note="96" file="organs/CS002242.WMF.svg"/>
- <svglayer note="97" file="organs/CS002245.WMF.svg"/>
- <svglayer note="98" file="organs/CS002246.WMF.svg"/>
- <svglayer note="99" file="organs/CS002249.WMF.svg"/>
- <svglayer note="100" file="organs/CS002254.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/panel.xml b/liveengine/bin/data/panel.xml
deleted file mode 100755
index ee87c83..0000000
--- a/liveengine/bin/data/panel.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<reverse_main>0</reverse_main>
-<control_colours>0</control_colours>
-<randomise_note_colours>1</randomise_note_colours>
-<transparent_black>0</transparent_black>
diff --git a/liveengine/bin/data/reptiles.xml b/liveengine/bin/data/reptiles.xml
deleted file mode 100755
index ca38f60..0000000
--- a/liveengine/bin/data/reptiles.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Reptiles">
- <svglayer note="36" file="reptiles/01LIZARD.WMF.svg"/>
- <svglayer note="37" file="reptiles/AA01001A.WMF.svg"/>
- <svglayer note="38" file="reptiles/AA01002A.WMF.svg"/>
- <svglayer note="39" file="reptiles/AA01003A.WMF.svg"/>
- <svglayer note="40" file="reptiles/AA01004A.WMF.svg"/>
- <svglayer note="41" file="reptiles/AA01005A.WMF.svg"/>
- <svglayer note="42" file="reptiles/AA01006A.WMF.svg"/>
- <svglayer note="43" file="reptiles/AA01008A.WMF.svg"/>
- <svglayer note="44" file="reptiles/AA01009A.WMF.svg"/>
- <svglayer note="45" file="reptiles/AA01010A.WMF.svg"/>
- <svglayer note="46" file="reptiles/AA01011A.WMF.svg"/>
- <svglayer note="47" file="reptiles/AA01012A.WMF.svg"/>
- <svglayer note="48" file="reptiles/AA01013A.WMF.svg"/>
- <svglayer note="49" file="reptiles/AA01014A.WMF.svg"/>
- <svglayer note="50" file="reptiles/AA01015A.WMF.svg"/>
- <svglayer note="51" file="reptiles/AA01016A.WMF.svg"/>
- <svglayer note="52" file="reptiles/AA01018A.WMF.svg"/>
- <svglayer note="53" file="reptiles/AA01019A.WMF.svg"/>
- <svglayer note="54" file="reptiles/AA01020A.WMF.svg"/>
- <svglayer note="55" file="reptiles/AA01021A.WMF.svg"/>
- <svglayer note="56" file="reptiles/AA01022A.WMF.svg"/>
- <svglayer note="57" file="reptiles/AA01023A.WMF.svg"/>
- <svglayer note="58" file="reptiles/AA01024A.WMF.svg"/>
- <svglayer note="59" file="reptiles/AA01025A.WMF.svg"/>
- <svglayer note="60" file="reptiles/AA01026A.WMF.svg"/>
- <svglayer note="61" file="reptiles/AA01027A.WMF.svg"/>
- <svglayer note="62" file="reptiles/AA01028A.WMF.svg"/>
- <svglayer note="63" file="reptiles/AA01029A.WMF.svg"/>
- <svglayer note="64" file="reptiles/AA01030A.WMF.svg"/>
- <svglayer note="65" file="reptiles/AA01031A.WMF.svg"/>
- <svglayer note="66" file="reptiles/AA01032A.WMF.svg"/>
- <svglayer note="67" file="reptiles/AA01033A.WMF.svg"/>
- <svglayer note="68" file="reptiles/AA01034A.WMF.svg"/>
- <svglayer note="69" file="reptiles/AA01035A.WMF.svg"/>
- <svglayer note="70" file="reptiles/AA01036A.WMF.svg"/>
- <svglayer note="71" file="reptiles/AA01037A.WMF.svg"/>
- <svglayer note="72" file="reptiles/AA01038A.WMF.svg"/>
- <svglayer note="73" file="reptiles/AA01039A.WMF.svg"/>
- <svglayer note="74" file="reptiles/AA01040A.WMF.svg"/>
- <svglayer note="75" file="reptiles/AA01041A.WMF.svg"/>
- <svglayer note="76" file="reptiles/AA01042A.WMF.svg"/>
- <svglayer note="77" file="reptiles/AA01043A.WMF.svg"/>
- <svglayer note="78" file="reptiles/AA01044A.WMF.svg"/>
- <svglayer note="79" file="reptiles/AA01045A.WMF.svg"/>
- <svglayer note="80" file="reptiles/AA01046A.WMF.svg"/>
- <svglayer note="81" file="reptiles/AA01047A.WMF.svg"/>
- <svglayer note="82" file="reptiles/AA01048A.WMF.svg"/>
- <svglayer note="83" file="reptiles/AA01049A.WMF.svg"/>
- <svglayer note="84" file="reptiles/AA01050A.WMF.svg"/>
- <svglayer note="85" file="reptiles/AA01051A.WMF.svg"/>
- <svglayer note="86" file="reptiles/AA01052A.WMF.svg"/>
- <svglayer note="87" file="reptiles/AA01053A.WMF.svg"/>
- <svglayer note="88" file="reptiles/AA01054A.WMF.svg"/>
- <svglayer note="89" file="reptiles/AA01055A.WMF.svg"/>
- <svglayer note="90" file="reptiles/AA01056A.WMF.svg"/>
- <svglayer note="91" file="reptiles/AA01057A.WMF.svg"/>
- <svglayer note="92" file="reptiles/AA01058A.WMF.svg"/>
- <svglayer note="93" file="reptiles/AA01059A.WMF.svg"/>
- <svglayer note="94" file="reptiles/AA01060A.WMF.svg"/>
- <svglayer note="95" file="reptiles/AA01061A.WMF.svg"/>
- <svglayer note="96" file="reptiles/AA01062A.WMF.svg"/>
- <svglayer note="97" file="reptiles/AA01063A.WMF.svg"/>
- <svglayer note="98" file="reptiles/AA01064A.WMF.svg"/>
- <svglayer note="99" file="reptiles/AA01065A.WMF.svg"/>
- <svglayer note="100" file="reptiles/AA01066A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/settings.xml b/liveengine/bin/data/settings.xml
deleted file mode 100755
index 5fc4912..0000000
--- a/liveengine/bin/data/settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<liveEngine port="1" channel="0">
- <viewport mapped="1" w="768" h="1024" x="0" y="0" rot="-90" ox="-256" oy="-384">
- <settings fov="17.500000" roll="0.000000" targX="-247.713226" targY="212.727859" targZ="0.000000" lat="0.000000" lng="180.000000" dolly="600.000000" />
- </viewport>
-</liveEngine>
diff --git a/liveengine/bin/data/tai_chi.xml b/liveengine/bin/data/tai_chi.xml
deleted file mode 100755
index dc0bfbe..0000000
--- a/liveengine/bin/data/tai_chi.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<playlist name="tai_chi">
- <svglayer note="38" file="tai_chi/RG01030A.WMF.svg"/>
- <svglayer note="69" file="tai_chi/RG01031A.WMF.svg"/>
- <svglayer note="58" file="tai_chi/RG01032A.WMF.svg"/>
- <svglayer note="84" file="tai_chi/RG01033A.WMF.svg"/>
- <svglayer note="95" file="tai_chi/RG01034A.WMF.svg"/>
- <svglayer note="59" file="tai_chi/RG01035A.WMF.svg"/>
- <svglayer note="44" file="tai_chi/RG01036A.WMF.svg"/>
- <svglayer note="40" file="tai_chi/RG01037A.WMF.svg"/>
- <svglayer note="52" file="tai_chi/RG01038A.WMF.svg"/>
- <svglayer note="41" file="tai_chi/RG01039A.WMF.svg"/>
- <svglayer note="67" file="tai_chi/RG01040A.WMF.svg"/>
- <svglayer note="77" file="tai_chi/RG01041A.WMF.svg"/>
- <svglayer note="86" file="tai_chi/RG01042A.WMF.svg"/>
- <svglayer note="90" file="tai_chi/RG01043A.WMF.svg"/>
- <svglayer note="79" file="tai_chi/RG01044A.WMF.svg"/>
- <svglayer note="42" file="tai_chi/RG01045A.WMF.svg"/>
- <svglayer note="82" file="tai_chi/RG01046A.WMF.svg"/>
- <svglayer note="97" file="tai_chi/RG01047A.WMF.svg"/>
- <svglayer note="36" file="tai_chi/RG01048A.WMF.svg"/>
- <svglayer note="48" file="tai_chi/RG01049A.WMF.svg"/>
- <svglayer note="76" file="tai_chi/RG01050A.WMF.svg"/>
- <svglayer note="46" file="tai_chi/RG01051A.WMF.svg"/>
- <svglayer note="61" file="tai_chi/RG01052A.WMF.svg"/>
- <svglayer note="74" file="tai_chi/RG01053A.WMF.svg"/>
- <svglayer note="63" file="tai_chi/RG01054A.WMF.svg"/>
- <svglayer note="71" file="tai_chi/RG01055A.WMF.svg"/>
- <svglayer note="72" file="tai_chi/RG01056A.WMF.svg"/>
- <svglayer note="53" file="tai_chi/RG01057A.WMF.svg"/>
- <svglayer note="94" file="tai_chi/RG01058A.WMF.svg"/>
- <svglayer note="43" file="tai_chi/RG01059A.WMF.svg"/>
- <svglayer note="64" file="tai_chi/RG01060A.WMF.svg"/>
- <svglayer note="99" file="tai_chi/RG01061A.WMF.svg"/>
- <svglayer note="88" file="tai_chi/RG01062A.WMF.svg"/>
- <svglayer note="66" file="tai_chi/RG01063A.WMF.svg"/>
- <svglayer note="60" file="tai_chi/RG01064A.WMF.svg"/>
- <svglayer note="91" file="tai_chi/RG01065A.WMF.svg"/>
- <svglayer note="75" file="tai_chi/RG01066A.WMF.svg"/>
- <svglayer note="49" file="tai_chi/RG01067A.WMF.svg"/>
- <svglayer note="85" file="tai_chi/RG01068A.WMF.svg"/>
- <svglayer note="45" file="tai_chi/RG01069A.WMF.svg"/>
- <svglayer note="70" file="tai_chi/RG01070A.WMF.svg"/>
- <svglayer note="92" file="tai_chi/RG01072A.WMF.svg"/>
- <svglayer note="96" file="tai_chi/RG01074A.WMF.svg"/>
- <svglayer note="47" file="tai_chi/RG01076A.WMF.svg"/>
- <svglayer note="78" file="tai_chi/RG01077A.WMF.svg"/>
- <svglayer note="65" file="tai_chi/RG01078A.WMF.svg"/>
- <svglayer note="83" file="tai_chi/RG01079A.WMF.svg"/>
- <svglayer note="37" file="tai_chi/RG01080A.WMF.svg"/>
- <svglayer note="62" file="tai_chi/RG01081A.WMF.svg"/>
- <svglayer note="73" file="tai_chi/RG01082A.WMF.svg"/>
- <svglayer note="80" file="tai_chi/RG01083A.WMF.svg"/>
- <svglayer note="51" file="tai_chi/RG01084A.WMF.svg"/>
- <svglayer note="50" file="tai_chi/RG01085A.WMF.svg"/>
- <svglayer note="87" file="tai_chi/RG01086A.WMF.svg"/>
- <svglayer note="54" file="tai_chi/RG01087A.WMF.svg"/>
- <svglayer note="93" file="tai_chi/RG01088A.WMF.svg"/>
- <svglayer note="81" file="tai_chi/RG01089A.WMF.svg"/>
- <svglayer note="98" file="tai_chi/RG01090A.WMF.svg"/>
- <svglayer note="55" file="tai_chi/RG01099A.WMF.svg"/>
- <svglayer note="39" file="tai_chi/RG01100A.WMF.svg"/>
- <svglayer note="89" file="tai_chi/RG01101A.WMF.svg"/>
- <svglayer note="57" file="tai_chi/RG01102A.WMF.svg"/>
- <svglayer note="68" file="tai_chi/RG01103A.WMF.svg"/>
- <svglayer note="56" file="tai_chi/RG01104A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/teamsports.xml b/liveengine/bin/data/teamsports.xml
deleted file mode 100755
index 0d16db2..0000000
--- a/liveengine/bin/data/teamsports.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<playlist name="teamsports">
- <svglayer note="69" file="teamsports/HOCKEY1.WMF.svg"/>
- <svglayer note="57" file="teamsports/HOCKEY2.WMF.svg"/>
- <svglayer note="71" file="teamsports/HOCKEY3.WMF.svg"/>
- <svglayer note="51" file="teamsports/HOCKEY4.WMF.svg"/>
- <svglayer note="42" file="teamsports/HOCKEYA.WMF.svg"/>
- <svglayer note="88" file="teamsports/HOCKEY_1.WMF.svg"/>
- <svglayer note="54" file="teamsports/RD01003A.WMF.svg"/>
- <svglayer note="85" file="teamsports/RD01021A.WMF.svg"/>
- <svglayer note="76" file="teamsports/RD01026A.WMF.svg"/>
- <svglayer note="84" file="teamsports/RD01085A.WMF.svg"/>
- <svglayer note="53" file="teamsports/RD01104A.WMF.svg"/>
- <svglayer note="90" file="teamsports/RD01105A.WMF.svg"/>
- <svglayer note="94" file="teamsports/RD01110A.WMF.svg"/>
- <svglayer note="97" file="teamsports/RD01111A.WMF.svg"/>
- <svglayer note="50" file="teamsports/RD01134A.WMF.svg"/>
- <svglayer note="77" file="teamsports/RD01138A.WMF.svg"/>
- <svglayer note="75" file="teamsports/RD01166A.WMF.svg"/>
- <svglayer note="89" file="teamsports/RD01173A.WMF.svg"/>
- <svglayer note="37" file="teamsports/RD01175A.WMF.svg"/>
- <svglayer note="80" file="teamsports/RD01177A.WMF.svg"/>
- <svglayer note="36" file="teamsports/RD01246A.WMF.svg"/>
- <svglayer note="47" file="teamsports/RD01263A.WMF.svg"/>
- <svglayer note="56" file="teamsports/RD01264A.WMF.svg"/>
- <svglayer note="46" file="teamsports/RD01265A.WMF.svg"/>
- <svglayer note="52" file="teamsports/RD01284A.WMF.svg"/>
- <svglayer note="60" file="teamsports/RD01285A.WMF.svg"/>
- <svglayer note="74" file="teamsports/RD01287A.WMF.svg"/>
- <svglayer note="78" file="teamsports/RD01288A.WMF.svg"/>
- <svglayer note="99" file="teamsports/RD01289A.WMF.svg"/>
- <svglayer note="92" file="teamsports/RD01290A.WMF.svg"/>
- <svglayer note="62" file="teamsports/RD01425A.WMF.svg"/>
- <svglayer note="59" file="teamsports/RD01427A.WMF.svg"/>
- <svglayer note="91" file="teamsports/RD01525A.WMF.svg"/>
- <svglayer note="68" file="teamsports/RD01577A.WMF.svg"/>
- <svglayer note="98" file="teamsports/RD01586A.WMF.svg"/>
- <svglayer note="55" file="teamsports/RD01589A.WMF.svg"/>
- <svglayer note="70" file="teamsports/RD01590A.WMF.svg"/>
- <svglayer note="95" file="teamsports/RD01593A.WMF.svg"/>
- <svglayer note="66" file="teamsports/RD01606A.WMF.svg"/>
- <svglayer note="86" file="teamsports/RD01615A.WMF.svg"/>
- <svglayer note="82" file="teamsports/RD01617A.WMF.svg"/>
- <svglayer note="72" file="teamsports/RD01618A.WMF.svg"/>
- <svglayer note="48" file="teamsports/RD01619A.WMF.svg"/>
- <svglayer note="41" file="teamsports/RD01620A.WMF.svg"/>
- <svglayer note="83" file="teamsports/RD01621A.WMF.svg"/>
- <svglayer note="61" file="teamsports/RD01622A.WMF.svg"/>
- <svglayer note="79" file="teamsports/RD01627A.WMF.svg"/>
- <svglayer note="45" file="teamsports/RD01628A.WMF.svg"/>
- <svglayer note="44" file="teamsports/RD01630A.WMF.svg"/>
- <svglayer note="58" file="teamsports/RD01631A.WMF.svg"/>
- <svglayer note="67" file="teamsports/RD01633A.WMF.svg"/>
- <svglayer note="49" file="teamsports/RD01634A.WMF.svg"/>
- <svglayer note="65" file="teamsports/RD01636A.WMF.svg"/>
- <svglayer note="38" file="teamsports/RD01650A.WMF.svg"/>
- <svglayer note="43" file="teamsports/RD01655A.WMF.svg"/>
- <svglayer note="63" file="teamsports/RD01661A.WMF.svg"/>
- <svglayer note="81" file="teamsports/RD01662A.WMF.svg"/>
- <svglayer note="40" file="teamsports/RD01669A.WMF.svg"/>
- <svglayer note="73" file="teamsports/RD01674A.WMF.svg"/>
- <svglayer note="39" file="teamsports/RD01677A.WMF.svg"/>
- <svglayer note="93" file="teamsports/RD01678A.WMF.svg"/>
- <svglayer note="96" file="teamsports/RD01680A.WMF.svg"/>
- <svglayer note="64" file="teamsports/RD01682A.WMF.svg"/>
- <svglayer note="87" file="teamsports/RD01698A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/tools.xml b/liveengine/bin/data/tools.xml
deleted file mode 100755
index 7cca131..0000000
--- a/liveengine/bin/data/tools.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Tools">
- <svglayer note="36" file="tools/Bit0605.wmf.svg"/>
- <svglayer note="37" file="tools/Bit0607.wmf.svg"/>
- <svglayer note="38" file="tools/Bit0608.wmf.svg"/>
- <svglayer note="39" file="tools/CAPNUTS.WMF.svg"/>
- <svglayer note="40" file="tools/CAPSCR01.WMF.svg"/>
- <svglayer note="41" file="tools/CAPSCR02.WMF.svg"/>
- <svglayer note="42" file="tools/CAPSCR03.WMF.svg"/>
- <svglayer note="43" file="tools/CAPSCR04.WMF.svg"/>
- <svglayer note="44" file="tools/CAPSCR06.WMF.svg"/>
- <svglayer note="45" file="tools/CARSCRW.WMF.svg"/>
- <svglayer note="46" file="tools/CONECT07.WMF.svg"/>
- <svglayer note="47" file="tools/CONECT08.WMF.svg"/>
- <svglayer note="48" file="tools/CONECT10.WMF.svg"/>
- <svglayer note="49" file="tools/CONECT24.WMF.svg"/>
- <svglayer note="50" file="tools/CONECT25.WMF.svg"/>
- <svglayer note="51" file="tools/CONECT30.WMF.svg"/>
- <svglayer note="52" file="tools/CONECT33.WMF.svg"/>
- <svglayer note="53" file="tools/CONECT34.WMF.svg"/>
- <svglayer note="54" file="tools/CONECT35.WMF.svg"/>
- <svglayer note="55" file="tools/COPLUG.WMF.svg"/>
- <svglayer note="56" file="tools/MACSCR02.WMF.svg"/>
- <svglayer note="57" file="tools/MATRL006.WMF.svg"/>
- <svglayer note="58" file="tools/MATRL007.WMF.svg"/>
- <svglayer note="59" file="tools/MATRL008.WMF.svg"/>
- <svglayer note="60" file="tools/MATRL010.WMF.svg"/>
- <svglayer note="61" file="tools/TAPSCR03.WMF.svg"/>
- <svglayer note="62" file="tools/TEENUT.WMF.svg"/>
- <svglayer note="63" file="tools/TERMIN01.WMF.svg"/>
- <svglayer note="64" file="tools/TERMIN07.WMF.svg"/>
- <svglayer note="65" file="tools/TERMIN10.WMF.svg"/>
- <svglayer note="66" file="tools/TERMIN14.WMF.svg"/>
- <svglayer note="67" file="tools/TERMIN15.WMF.svg"/>
- <svglayer note="68" file="tools/TERMIN16.WMF.svg"/>
- <svglayer note="69" file="tools/TERMIN20.WMF.svg"/>
- <svglayer note="70" file="tools/TERMIN21.WMF.svg"/>
- <svglayer note="71" file="tools/TERMIN25.WMF.svg"/>
- <svglayer note="72" file="tools/TERMIN28.WMF.svg"/>
- <svglayer note="73" file="tools/TERMIN29.WMF.svg"/>
- <svglayer note="74" file="tools/TERMIN31.WMF.svg"/>
- <svglayer note="75" file="tools/TERMIN33.WMF.svg"/>
- <svglayer note="76" file="tools/TERMIN34.WMF.svg"/>
- <svglayer note="77" file="tools/TERMIN35.WMF.svg"/>
- <svglayer note="78" file="tools/TERMIN36.WMF.svg"/>
- <svglayer note="79" file="tools/UDRIVE.WMF.svg"/>
- <svglayer note="80" file="tools/Bit0605.wmf.svg"/>
- <svglayer note="81" file="tools/Bit0607.wmf.svg"/>
- <svglayer note="82" file="tools/Bit0608.wmf.svg"/>
- <svglayer note="83" file="tools/CAPNUTS.WMF.svg"/>
- <svglayer note="84" file="tools/CAPSCR01.WMF.svg"/>
- <svglayer note="85" file="tools/CAPSCR02.WMF.svg"/>
- <svglayer note="86" file="tools/CAPSCR03.WMF.svg"/>
- <svglayer note="87" file="tools/CAPSCR04.WMF.svg"/>
- <svglayer note="88" file="tools/CAPSCR06.WMF.svg"/>
- <svglayer note="89" file="tools/CARSCRW.WMF.svg"/>
- <svglayer note="90" file="tools/CONECT07.WMF.svg"/>
- <svglayer note="91" file="tools/CONECT08.WMF.svg"/>
- <svglayer note="92" file="tools/CONECT10.WMF.svg"/>
- <svglayer note="93" file="tools/CONECT24.WMF.svg"/>
- <svglayer note="94" file="tools/CONECT25.WMF.svg"/>
- <svglayer note="95" file="tools/CONECT30.WMF.svg"/>
- <svglayer note="96" file="tools/CONECT33.WMF.svg"/>
- <svglayer note="97" file="tools/CONECT34.WMF.svg"/>
- <svglayer note="98" file="tools/CONECT35.WMF.svg"/>
- <svglayer note="99" file="tools/COPLUG.WMF.svg"/>
- <svglayer note="100" file="tools/MACSCR02.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/trainers.xml b/liveengine/bin/data/trainers.xml
deleted file mode 100755
index 51520c6..0000000
--- a/liveengine/bin/data/trainers.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Trainers">
- <svglayer note="36" file="trainers/adidas01.svg"/>
- <svglayer note="37" file="trainers/adidas02.svg"/>
- <svglayer note="38" file="trainers/adidas03.svg"/>
- <svglayer note="39" file="trainers/adidas04.svg"/>
- <svglayer note="40" file="trainers/adidas05.svg"/>
- <svglayer note="41" file="trainers/adidas06.svg"/>
- <svglayer note="42" file="trainers/hummel.svg"/>
- <svglayer note="43" file="trainers/nb01.svg"/>
- <svglayer note="44" file="trainers/nike01.svg"/>
- <svglayer note="45" file="trainers/nike02.svg"/>
- <svglayer note="46" file="trainers/puma01.svg"/>
- <svglayer note="47" file="trainers/reebok01.svg"/>
- <svglayer note="48" file="trainers/reebok02.svg"/>
- <svglayer note="49" file="trainers/adidas01.svg"/>
- <svglayer note="50" file="trainers/adidas02.svg"/>
- <svglayer note="51" file="trainers/adidas03.svg"/>
- <svglayer note="52" file="trainers/adidas04.svg"/>
- <svglayer note="53" file="trainers/adidas05.svg"/>
- <svglayer note="54" file="trainers/adidas06.svg"/>
- <svglayer note="55" file="trainers/hummel.svg"/>
- <svglayer note="56" file="trainers/nb01.svg"/>
- <svglayer note="57" file="trainers/nike01.svg"/>
- <svglayer note="58" file="trainers/nike02.svg"/>
- <svglayer note="59" file="trainers/puma01.svg"/>
- <svglayer note="60" file="trainers/reebok01.svg"/>
- <svglayer note="61" file="trainers/reebok02.svg"/>
- <svglayer note="62" file="trainers/adidas01.svg"/>
- <svglayer note="63" file="trainers/adidas02.svg"/>
- <svglayer note="64" file="trainers/adidas03.svg"/>
- <svglayer note="65" file="trainers/adidas04.svg"/>
- <svglayer note="66" file="trainers/adidas05.svg"/>
- <svglayer note="67" file="trainers/adidas06.svg"/>
- <svglayer note="68" file="trainers/hummel.svg"/>
- <svglayer note="69" file="trainers/nb01.svg"/>
- <svglayer note="70" file="trainers/nike01.svg"/>
- <svglayer note="71" file="trainers/nike02.svg"/>
- <svglayer note="72" file="trainers/puma01.svg"/>
- <svglayer note="73" file="trainers/reebok01.svg"/>
- <svglayer note="74" file="trainers/reebok02.svg"/>
- <svglayer note="75" file="trainers/adidas01.svg"/>
- <svglayer note="76" file="trainers/adidas02.svg"/>
- <svglayer note="77" file="trainers/adidas03.svg"/>
- <svglayer note="78" file="trainers/adidas04.svg"/>
- <svglayer note="79" file="trainers/adidas05.svg"/>
- <svglayer note="80" file="trainers/adidas06.svg"/>
- <svglayer note="81" file="trainers/hummel.svg"/>
- <svglayer note="82" file="trainers/nb01.svg"/>
- <svglayer note="83" file="trainers/nike01.svg"/>
- <svglayer note="84" file="trainers/nike02.svg"/>
- <svglayer note="85" file="trainers/puma01.svg"/>
- <svglayer note="86" file="trainers/reebok01.svg"/>
- <svglayer note="87" file="trainers/reebok02.svg"/>
- <svglayer note="88" file="trainers/adidas01.svg"/>
- <svglayer note="89" file="trainers/adidas02.svg"/>
- <svglayer note="90" file="trainers/adidas03.svg"/>
- <svglayer note="91" file="trainers/adidas04.svg"/>
- <svglayer note="92" file="trainers/adidas05.svg"/>
- <svglayer note="93" file="trainers/adidas06.svg"/>
- <svglayer note="94" file="trainers/hummel.svg"/>
- <svglayer note="95" file="trainers/nb01.svg"/>
- <svglayer note="96" file="trainers/nike01.svg"/>
- <svglayer note="97" file="trainers/nike02.svg"/>
- <svglayer note="98" file="trainers/puma01.svg"/>
- <svglayer note="99" file="trainers/reebok01.svg"/>
- <svglayer note="100" file="trainers/reebok02.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/women_ethnic.xml b/liveengine/bin/data/women_ethnic.xml
deleted file mode 100755
index 629ce55..0000000
--- a/liveengine/bin/data/women_ethnic.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Ethnic Women">
- <svglayer note="36" file="women_ethnic/NA01013A.WMF.svg"/>
- <svglayer note="37" file="women_ethnic/NA01014A.WMF.svg"/>
- <svglayer note="38" file="women_ethnic/NA01017A.WMF.svg"/>
- <svglayer note="39" file="women_ethnic/NA01018A.WMF.svg"/>
- <svglayer note="40" file="women_ethnic/NA01020A.WMF.svg"/>
- <svglayer note="41" file="women_ethnic/NA01023A.WMF.svg"/>
- <svglayer note="42" file="women_ethnic/NA01024A.WMF.svg"/>
- <svglayer note="43" file="women_ethnic/NA01025A.WMF.svg"/>
- <svglayer note="44" file="women_ethnic/NA01028A.WMF.svg"/>
- <svglayer note="45" file="women_ethnic/NA01029A.WMF.svg"/>
- <svglayer note="46" file="women_ethnic/NA01031A.WMF.svg"/>
- <svglayer note="47" file="women_ethnic/NA01032A.WMF.svg"/>
- <svglayer note="48" file="women_ethnic/NA01038A.WMF.svg"/>
- <svglayer note="49" file="women_ethnic/NA01039A.WMF.svg"/>
- <svglayer note="50" file="women_ethnic/NA01040A.WMF.svg"/>
- <svglayer note="51" file="women_ethnic/NA01041A.WMF.svg"/>
- <svglayer note="52" file="women_ethnic/NA01042A.WMF.svg"/>
- <svglayer note="53" file="women_ethnic/NA01043A.WMF.svg"/>
- <svglayer note="54" file="women_ethnic/NA01045A.WMF.svg"/>
- <svglayer note="55" file="women_ethnic/NA01061A.WMF.svg"/>
- <svglayer note="56" file="women_ethnic/NA01066A.WMF.svg"/>
- <svglayer note="57" file="women_ethnic/NA01085A.WMF.svg"/>
- <svglayer note="58" file="women_ethnic/NA01089A.WMF.svg"/>
- <svglayer note="59" file="women_ethnic/NA01092A.WMF.svg"/>
- <svglayer note="60" file="women_ethnic/NA01093A.WMF.svg"/>
- <svglayer note="61" file="women_ethnic/NA01095A.WMF.svg"/>
- <svglayer note="62" file="women_ethnic/NA01099A.WMF.svg"/>
- <svglayer note="63" file="women_ethnic/NA01100A.WMF.svg"/>
- <svglayer note="64" file="women_ethnic/NA01101A.WMF.svg"/>
- <svglayer note="65" file="women_ethnic/NA01102A.WMF.svg"/>
- <svglayer note="66" file="women_ethnic/NA01104A.WMF.svg"/>
- <svglayer note="67" file="women_ethnic/NA01105A.WMF.svg"/>
- <svglayer note="68" file="women_ethnic/NA01106A.WMF.svg"/>
- <svglayer note="69" file="women_ethnic/NA01107A.WMF.svg"/>
- <svglayer note="70" file="women_ethnic/NA01108A.WMF.svg"/>
- <svglayer note="71" file="women_ethnic/NA01109A.WMF.svg"/>
- <svglayer note="72" file="women_ethnic/NA01111A.WMF.svg"/>
- <svglayer note="73" file="women_ethnic/NA01112A.WMF.svg"/>
- <svglayer note="74" file="women_ethnic/NA01115A.WMF.svg"/>
- <svglayer note="75" file="women_ethnic/NA01117A.WMF.svg"/>
- <svglayer note="76" file="women_ethnic/NA01124A.WMF.svg"/>
- <svglayer note="77" file="women_ethnic/NA01130A.WMF.svg"/>
- <svglayer note="78" file="women_ethnic/NA01131A.WMF.svg"/>
- <svglayer note="79" file="women_ethnic/NA01146A.WMF.svg"/>
- <svglayer note="80" file="women_ethnic/NA01147A.WMF.svg"/>
- <svglayer note="81" file="women_ethnic/NA01181A.WMF.svg"/>
- <svglayer note="82" file="women_ethnic/NA01184A.WMF.svg"/>
- <svglayer note="83" file="women_ethnic/NA01189A.WMF.svg"/>
- <svglayer note="84" file="women_ethnic/NA01194A.WMF.svg"/>
- <svglayer note="85" file="women_ethnic/NA01197A.WMF.svg"/>
- <svglayer note="86" file="women_ethnic/NA01198A.WMF.svg"/>
- <svglayer note="87" file="women_ethnic/NA01205A.WMF.svg"/>
- <svglayer note="88" file="women_ethnic/NA01206A.WMF.svg"/>
- <svglayer note="89" file="women_ethnic/NA01210A.WMF.svg"/>
- <svglayer note="90" file="women_ethnic/NA01217A.WMF.svg"/>
- <svglayer note="91" file="women_ethnic/NA01219A.WMF.svg"/>
- <svglayer note="92" file="women_ethnic/NA01224A.WMF.svg"/>
- <svglayer note="93" file="women_ethnic/NA01225A.WMF.svg"/>
- <svglayer note="94" file="women_ethnic/NA01226A.WMF.svg"/>
- <svglayer note="95" file="women_ethnic/NA01233A.WMF.svg"/>
- <svglayer note="96" file="women_ethnic/NA01238A.WMF.svg"/>
- <svglayer note="97" file="women_ethnic/NA01240A.WMF.svg"/>
- <svglayer note="98" file="women_ethnic/NA01243A.WMF.svg"/>
- <svglayer note="99" file="women_ethnic/NA01244A.WMF.svg"/>
- <svglayer note="100" file="women_ethnic/NA01245A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/bin/data/yoga.xml b/liveengine/bin/data/yoga.xml
deleted file mode 100755
index 1fe9793..0000000
--- a/liveengine/bin/data/yoga.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<playlist name="Yoga">
- <svglayer note="36" file="yoga/RD01004A.WMF.svg"/>
- <svglayer note="37" file="yoga/RD01005A.WMF.svg"/>
- <svglayer note="38" file="yoga/RD01006A.WMF.svg"/>
- <svglayer note="39" file="yoga/RD01007A.WMF.svg"/>
- <svglayer note="40" file="yoga/RD01008A.WMF.svg"/>
- <svglayer note="41" file="yoga/RD01009A.WMF.svg"/>
- <svglayer note="42" file="yoga/RD01010A.WMF.svg"/>
- <svglayer note="43" file="yoga/RD01011A.WMF.svg"/>
- <svglayer note="44" file="yoga/RD01012A.WMF.svg"/>
- <svglayer note="45" file="yoga/RD01013A.WMF.svg"/>
- <svglayer note="46" file="yoga/RD01014A.WMF.svg"/>
- <svglayer note="47" file="yoga/RD01015A.WMF.svg"/>
- <svglayer note="48" file="yoga/RD01016A.WMF.svg"/>
- <svglayer note="49" file="yoga/RD01017A.WMF.svg"/>
- <svglayer note="50" file="yoga/RD01029A.WMF.svg"/>
- <svglayer note="51" file="yoga/RD01030A.WMF.svg"/>
- <svglayer note="52" file="yoga/RD01031A.WMF.svg"/>
- <svglayer note="53" file="yoga/RD01032A.WMF.svg"/>
- <svglayer note="54" file="yoga/RD01033A.WMF.svg"/>
- <svglayer note="55" file="yoga/RD01034A.WMF.svg"/>
- <svglayer note="56" file="yoga/RD01035A.WMF.svg"/>
- <svglayer note="57" file="yoga/RD01036A.WMF.svg"/>
- <svglayer note="58" file="yoga/RD01037A.WMF.svg"/>
- <svglayer note="59" file="yoga/RD01038A.WMF.svg"/>
- <svglayer note="60" file="yoga/RD01039A.WMF.svg"/>
- <svglayer note="61" file="yoga/RD01040A.WMF.svg"/>
- <svglayer note="62" file="yoga/RD01041A.WMF.svg"/>
- <svglayer note="63" file="yoga/RD01042A.WMF.svg"/>
- <svglayer note="64" file="yoga/RD01043A.WMF.svg"/>
- <svglayer note="65" file="yoga/RD01044A.WMF.svg"/>
- <svglayer note="66" file="yoga/RD01045A.WMF.svg"/>
- <svglayer note="67" file="yoga/RD01046A.WMF.svg"/>
- <svglayer note="68" file="yoga/RD01047A.WMF.svg"/>
- <svglayer note="69" file="yoga/RD01048A.WMF.svg"/>
- <svglayer note="70" file="yoga/RD01049A.WMF.svg"/>
- <svglayer note="71" file="yoga/RD01050A.WMF.svg"/>
- <svglayer note="72" file="yoga/RD01051A.WMF.svg"/>
- <svglayer note="73" file="yoga/RD01052A.WMF.svg"/>
- <svglayer note="74" file="yoga/RD01053A.WMF.svg"/>
- <svglayer note="75" file="yoga/RD01054A.WMF.svg"/>
- <svglayer note="76" file="yoga/RD01055A.WMF.svg"/>
- <svglayer note="77" file="yoga/RD01056A.WMF.svg"/>
- <svglayer note="78" file="yoga/RD01057A.WMF.svg"/>
- <svglayer note="79" file="yoga/RD01058A.WMF.svg"/>
- <svglayer note="80" file="yoga/RD01059A.WMF.svg"/>
- <svglayer note="81" file="yoga/RD01060A.WMF.svg"/>
- <svglayer note="82" file="yoga/RD01061A.WMF.svg"/>
- <svglayer note="83" file="yoga/RD01063A.WMF.svg"/>
- <svglayer note="84" file="yoga/RD01064A.WMF.svg"/>
- <svglayer note="85" file="yoga/RD01065A.WMF.svg"/>
- <svglayer note="86" file="yoga/RD01066A.WMF.svg"/>
- <svglayer note="87" file="yoga/RD01004A.WMF.svg"/>
- <svglayer note="88" file="yoga/RD01005A.WMF.svg"/>
- <svglayer note="89" file="yoga/RD01006A.WMF.svg"/>
- <svglayer note="90" file="yoga/RD01007A.WMF.svg"/>
- <svglayer note="91" file="yoga/RD01008A.WMF.svg"/>
- <svglayer note="92" file="yoga/RD01009A.WMF.svg"/>
- <svglayer note="93" file="yoga/RD01010A.WMF.svg"/>
- <svglayer note="94" file="yoga/RD01011A.WMF.svg"/>
- <svglayer note="95" file="yoga/RD01012A.WMF.svg"/>
- <svglayer note="96" file="yoga/RD01013A.WMF.svg"/>
- <svglayer note="97" file="yoga/RD01014A.WMF.svg"/>
- <svglayer note="98" file="yoga/RD01015A.WMF.svg"/>
- <svglayer note="99" file="yoga/RD01016A.WMF.svg"/>
- <svglayer note="100" file="yoga/RD01017A.WMF.svg"/>
-</playlist>
diff --git a/liveengine/liveengine.layout b/liveengine/liveengine.layout
index 6762492..b42382b 100755
--- a/liveengine/liveengine.layout
+++ b/liveengine/liveengine.layout
@@ -4,13 +4,13 @@
<File name="addons.make" open="0" top="0" tabpos="7">
<Cursor position="92" topLine="0" />
</File>
- <File name="bin/data/dancing.xml" open="1" top="0" tabpos="1">
+ <File name="bin/data/dancing.xml" open="0" top="0" tabpos="1">
<Cursor position="0" topLine="0" />
</File>
- <File name="bin/data/settings.xml" open="0" top="0" tabpos="5">
- <Cursor position="93" topLine="0" />
+ <File name="bin/data/settings.xml" open="0" top="0" tabpos="8">
+ <Cursor position="354" topLine="0" />
</File>
- <File name="config.make" open="1" top="0" tabpos="2">
+ <File name="config.make" open="0" top="0" tabpos="1">
<Cursor position="451" topLine="3" />
</File>
<File name="src/keyVar.cpp" open="0" top="0" tabpos="9">
@@ -19,14 +19,14 @@
<File name="src/keyVar.h" open="0" top="0" tabpos="10">
<Cursor position="0" topLine="3" />
</File>
- <File name="src/layers.cpp" open="1" top="0" tabpos="3">
+ <File name="src/layers.cpp" open="0" top="0" tabpos="2">
<Cursor position="2434" topLine="46" />
</File>
- <File name="src/layers.h" open="1" top="0" tabpos="4">
+ <File name="src/layers.h" open="0" top="0" tabpos="3">
<Cursor position="3260" topLine="76" />
</File>
- <File name="src/main.cpp" open="0" top="0" tabpos="6">
- <Cursor position="290" topLine="0" />
+ <File name="src/main.cpp" open="0" top="0" tabpos="7">
+ <Cursor position="258" topLine="0" />
</File>
<File name="src/playlist.cpp" open="0" top="0" tabpos="0">
<Cursor position="1621" topLine="40" />
@@ -34,16 +34,16 @@
<File name="src/playlist.h" open="0" top="0" tabpos="0">
<Cursor position="536" topLine="0" />
</File>
- <File name="src/testApp.cpp" open="1" top="0" tabpos="5">
- <Cursor position="14329" topLine="409" />
+ <File name="src/testApp.cpp" open="0" top="0" tabpos="4">
+ <Cursor position="7003" topLine="0" />
</File>
<File name="src/testApp.h" open="0" top="0" tabpos="1">
- <Cursor position="3028" topLine="105" />
+ <Cursor position="3691" topLine="159" />
</File>
- <File name="src/viewport.cpp" open="1" top="1" tabpos="7">
+ <File name="src/viewport.cpp" open="0" top="0" tabpos="6">
<Cursor position="4344" topLine="34" />
</File>
- <File name="src/viewport.h" open="1" top="0" tabpos="6">
+ <File name="src/viewport.h" open="0" top="0" tabpos="5">
<Cursor position="42" topLine="36" />
</File>
</CodeBlocks_layout_file>
diff --git a/liveengine/src/main.cpp b/liveengine/src/main.cpp
index f0c0c0f..d22025f 100755
--- a/liveengine/src/main.cpp
+++ b/liveengine/src/main.cpp
@@ -7,7 +7,7 @@
int main( ){
ofAppGlutWindow window;
- ofSetupOpenGL(ofxFensterManager::get(),1024,768, OF_WINDOW); //2048,768
+ ofSetupOpenGL(ofxFensterManager::get(),4080,768, OF_WINDOW); //2048,768
//ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context
//ofSetupOpenGL(&window, 1024,768, OF_WINDOW);
diff --git a/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp
index c69ac66..ced71d4 100755
--- a/liveengine/src/testApp.cpp
+++ b/liveengine/src/testApp.cpp
@@ -427,12 +427,14 @@ void testApp::keyPressed(int key, ofxFenster* win){
}
void testApp::keyPressed(int key){
- if (activeView<0) for (int i=0;i<viewports.size();i++) if (viewports[i]->isMapped) viewports[i]->keyPressed(key);
- else if (activeView<viewports.size()&&viewports[activeView]->isMapped) viewports[activeView]->keyPressed(key);
+ if (activeView==-1) {
+ for (int i=0;i<viewports.size();i++) if (viewports[i]->isMapped) viewports[i]->keyPressed(key);
+ }
+ else if (activeView>-1&&activeView<viewports.size()&&viewports[activeView]->isMapped) viewports[activeView]->keyPressed(key);
if (key>='0' && key <='5'){
- activeView=min(key-'2',(int)viewports.size());
+ activeView=min(key-'2',(int)viewports.size()-1);
switch (activeView){
case -2:
printf("deactivating viewport adjustment\n");
@@ -444,7 +446,7 @@ void testApp::keyPressed(int key){
case 1:
case 2:
case 3:
- printf("adjusting viewport %i\n",activeView );
+ printf("adjusting viewport %i of %i\n",activeView,viewports.size());
break;
}
}
diff --git a/liveengine/src/viewport.cpp b/liveengine/src/viewport.cpp
index ddd1450..f86110f 100755
--- a/liveengine/src/viewport.cpp
+++ b/liveengine/src/viewport.cpp
@@ -184,10 +184,10 @@ void viewport::setcam(map<string,string>&settings){
vars[1].set('g','d',ofToFloat(settings["targX"]),10,1.0,3.0);
vars[2].set('r','v',ofToFloat(settings["targY"]),10,1.0,3.0);
vars[3].set('t','c',ofToFloat(settings["targZ"]),10,1.0,3.0);
- vars[4].set('u','n',ofToFloat(settings["lat"]),1,1.0,3.0);
- vars[5].set('j','h',ofToFloat(settings["lng"]),1,1.0,3.0);
- vars[6].set(',','m',ofToFloat(settings["roll"]),1,1.0,3.0);
- vars[7].set('o','l',ofToFloat(settings["dolly"]),1,1.0,3.0);
+ vars[4].set('u','n',ofToFloat(settings["lat"]),.03,1.0,3.0);
+ vars[5].set('j','h',ofToFloat(settings["lng"]),.03,1.0,3.0);
+ vars[6].set(',','m',ofToFloat(settings["roll"]),0.03,1.0,3.0);
+ vars[7].set('o','l',ofToFloat(settings["dolly"]),25,1.0,3.0);
vars[8].set('q','a',ofToFloat(settings["distort"]),.00001,1.0,3.0);
}
double viewport::getSetting(const string& setting){
diff --git a/liveengineUnmapped/src/main.cpp b/liveengineUnmapped/src/main.cpp
index f0c0c0f..d22025f 100755
--- a/liveengineUnmapped/src/main.cpp
+++ b/liveengineUnmapped/src/main.cpp
@@ -7,7 +7,7 @@
int main( ){
ofAppGlutWindow window;
- ofSetupOpenGL(ofxFensterManager::get(),1024,768, OF_WINDOW); //2048,768
+ ofSetupOpenGL(ofxFensterManager::get(),4080,768, OF_WINDOW); //2048,768
//ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context
//ofSetupOpenGL(&window, 1024,768, OF_WINDOW);
diff --git a/liveengineUnmapped/src/testApp.cpp b/liveengineUnmapped/src/testApp.cpp
index bd9d911..12388ea 100755
--- a/liveengineUnmapped/src/testApp.cpp
+++ b/liveengineUnmapped/src/testApp.cpp
@@ -3,6 +3,9 @@ previewWindow::~previewWindow(){
cout << "preview window destroyed" << endl;
}
void previewWindow::setup(){}
+void previewWindow::setParent(testApp *p){
+ parent=p;
+}
void previewWindow::setBuffer(ofFbo *buffer){
rb=buffer;
}
@@ -11,6 +14,9 @@ void previewWindow::draw(){
rb->draw(0,0,ofGetWidth(),ofGetHeight()); //why crash?
}
+void previewWindow::keyPressed(int key, ofxFenster* win){
+ parent->keyPressed(key);
+}
//--------------------------------------------------------------
guiWindow::~guiWindow(){
cout << "gui window destroyed" << endl;
@@ -38,16 +44,16 @@ void guiWindow::windowMoved(int x,int y){
}
//--------------------------------------------------------------
-void testApp::setup(){
- int midiPort=0;
- midiChannel=0;
- if( !XML.loadFile("settings.xml") ){
- printf("unable to load settings.xml check data/ folder\n");
- }else{
- printf("settings loaded!\n");
- midiPort=ofToInt(XML.getAttribute("liveEngine", "port", "0")); //default to 0/all
- midiChannel=ofToInt(XML.getAttribute("liveEngine", "channel", "0"));
- if (midiChannel) printf("listening on port %d, midi channel %d\n",midiPort,midiChannel);
+void testApp::setup(){
+ int midiPort=0;
+ midiChannel=0;
+ if( !XML.loadFile("settings.xml") ){
+ printf("unable to load settings.xml check data/ folder\n");
+ }else{
+ printf("settings loaded!\n");
+ midiPort=ofToInt(XML.getAttribute("liveEngine", "port", "0")); //default to 0/all
+ midiChannel=ofToInt(XML.getAttribute("liveEngine", "channel", "0"));
+ if (midiChannel) printf("listening on port %d, midi channel %d\n",midiPort,midiChannel);
else printf("listening on port %d, all midi channels\n",midiPort);
if(XML.pushTag("liveEngine")) {
int numViews=XML.getNumTags("viewport");
@@ -65,17 +71,17 @@ void testApp::setup(){
}
}
else printf("no viewports!\n");
- }
+ }
}
-
-
- midiIn.listPorts();
- midiIn.openPort(midiPort);
- midiIn.addListener(this);
-
- // to register only to one controller pass the id as first argument
- // midiIn.addListener(84,this);
- // to debug
+
+
+ midiIn.listPorts();
+ midiIn.openPort(midiPort);
+ midiIn.addListener(this);
+
+ // to register only to one controller pass the id as first argument
+ // midiIn.addListener(84,this);
+ // to debug
// midiIn.setVerbose(true);
controllers=new unsigned char[NUM_CONTROLLERS];
@@ -93,23 +99,23 @@ void testApp::setup(){
//vp1.setup(768,1024,1024,0,-90,-256,-384);
//vp2.setup(1024,768,0,0,0,-512,-384);
-
- showFPS=false;
+
+ showFPS=false;
ofBackground(0,0,0);
- ofSetBackgroundAuto(false);
-
- xshift=-1;
+ ofSetBackgroundAuto(false);
+
+ xshift=-1;
yshift=-1;
fadetime=0;
-
+
mode=BLOCKS;
lastnoteTime=ofGetElapsedTimef();
- decayTime=1.0f;
-
- //ofSetVerticalSync(true); deosn't seem effective
+ decayTime=1.0f;
+
+ //ofSetVerticalSync(true); deosn't seem effective
//glXSwapIntervalSGI(1);
/*
printf("hue of red is %f\n",ofColor(255,0,0).getHue());
@@ -132,6 +138,7 @@ void testApp::setup(){
win->setWindowTitle("preview");
win->addListener(prevWin);
prevWin->setup();
+ prevWin->setParent(this);
prevWin->setBuffer(&viewports[0]->rb2);
fullscreenoutput=false;
@@ -146,6 +153,8 @@ void testApp::setup(){
gui.add(resetFBscale.setup("reset FB scale"));
fadeScale=128;
gui.add(fS.setup("fade scale",fadeScale,0,255,255));
+ fadeBackground=0;
+ gui.add(fB.setup("fade scale",fadeBackground,0,255,255));
decayTime=1.0f;
gui.add(dT.setup("decay time",decayTime,0,10.0,255));
@@ -171,7 +180,7 @@ void testApp::setup(){
guiWin->setParent(this);
debug=false;
-
+
}
void testApp::resetDrawscalePressed(bool & pressed){
@@ -187,7 +196,7 @@ void testApp::makeColours() {
colShift=ofRandom(255.0f);
}
//--------------------------------------------------------------
-void testApp::update(){
+void testApp::update(){
//for (int i=0;i<numLayers;i++) layers[i]->update();
}
@@ -198,14 +207,14 @@ void testApp::draw(){
int ft=255-(fadetime*((float)fadeScale)*0.1f);
//if(ofGetFrameNum()%25==0) printf("fadeScale %i\n",(int)fadeScale);
- ofSetColor(ft,ft,ft); //for feedback
+ ofSetColor(ft,ft,ft); //for feedback
float os=oscScale?(sin((breakOsc?ofGetElapsedTimef()-(randomOsc?randOffs:lastnoteTime):ofGetElapsedTimef()))*scaleFrequency)*scaleAmplitude:0.0f;
//vp1.draw(lambda,controllers,xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,scale,fscale,noteRandomiseColours?colShift:0.0f);
//vp2.draw(lambda,controllers,reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,reversemain?1.0f/scale:scale,reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f);
for (int i=0;i<viewports.size();i++) {
bool even=!(i%2);
- viewports[i]->draw(lambda,controllers,even&&reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,even&&reversemain?1.0f/(scale+os):scale+os,even&&reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f);
+ viewports[i]->draw(lambda,controllers,even&&reversemain?-xshift:xshift,yshift,list,transparentBlack,note,mode,controller_colours,controlColours,even&&reversemain?1.0f/(scale+os):scale+os,even&&reversemain?1.0f/fscale:fscale,noteRandomiseColours?colShift:0.0f,fadeBackground);
}
ofSetColor(255,255,255);
@@ -231,35 +240,35 @@ void testApp::draw(){
float noteheight=rb1.getHeight()/NUM_CONTROLLERS;
-
- if (note>0) {
- switch(mode) {
+
+ if (note>0) {
+ switch(mode) {
case BLOCKS:
for (int i=0;i<NUM_CONTROLLERS;i++){
ofSetColor(ofColor((controller_colours[i].r*controllers[i])>>7,(controller_colours[i].g*controllers[i])>>7,(controller_colours[i].b*controllers[i])>>7));
ofRect((note-START_NOTE)*notewidth,i*noteheight,notewidth,noteheight);
- }
- break;
+ }
+ break;
case LIST:
- if (list.lock()) { //if playlist is loaded
+ if (list.lock()) { //if playlist is loaded
ofPushMatrix();
ofTranslate(rb1.getWidth()/2,rb1.getHeight()/2);
ofScale(scale,scale,scale);
ofRotate(rotate);
- ofTranslate(-rb1.getWidth()/2,-rb1.getHeight()/2);
+ ofTranslate(-rb1.getWidth()/2,-rb1.getHeight()/2);
if (list.layers.find(note)!=list.layers.end()) {
if (controlColours) list.layers[note]->draw(lamda,controllers,512,384,transparentBlack);
else list.layers[note]->draw(lamda,512,384);
- }
+ }
ofPopMatrix();
list.unlock();
- }
- break;
- }
- }
+ }
+ break;
+ }
+ }
- //for (int i=0;i<numLayers;i++) layers[i]->draw();
- ofSetColor(255,255,255);
+ //for (int i=0;i<numLayers;i++) layers[i]->draw();
+ ofSetColor(255,255,255);
if (showFPS) ofDrawBitmapString(ofToString(ofGetFrameRate(), 2),20,20);
rb1.end();
@@ -338,7 +347,7 @@ void testApp::draw(){
ofRect(0,0,1024,768);
ofSetColor(0,255,0);
ofRect(1024,0,1024,768);
- */
+ */
}
@@ -352,51 +361,51 @@ void testApp::keyPressed(int key, ofxFenster* win){
else keyPressed(key);
}
void testApp::keyPressed(int key){
- if(key =='q'){
+ if(key =='q'){
nmidiMessage(144,ofRandom(64)+36,127);
}
if(key == 's'){
XML.saveFile("settings.xml");
printf("settings saved!\n");
- }
- if(key == 'f'){
- toggleFPS();
- }
- if(key >='0' && key <= '9'){
- mode=key-'0';
- }
- if(key == 267){
- xshift--;
- }
- if(key == 268){
- xshift++;
- }
- if(key == 269){
- yshift--;
- }
- if(key == 270){
+ }
+ if(key == 'f'){
+ toggleFPS();
+ }
+ if(key >='0' && key <= '9'){
+ mode=key-'0';
+ }
+ if(key == 267||key==OF_KEY_LEFT){
+ xshift--;
+ }
+ if(key == 268||key==OF_KEY_RIGHT){
+ xshift++;
+ }
+ if(key == 269||key==OF_KEY_UP){
+ yshift--;
+ }
+ if(key == 270||key==OF_KEY_DOWN){
yshift++;
- }
- if(key == '='){
- makeColours();
}
- if(key == '+'){
- fadetime=min(128,fadetime+1);
+ if(key == '='){
+ makeColours();
}
- if(key == '_'){
- fadetime=max(0,fadetime-1);
+ if(key == '+'){
+ fadetime=min(128,fadetime+1);
}
- if(key == ']'){
- scale*=1.01;
+ if(key == '_'){
+ fadetime=max(0,fadetime-1);
}
- if(key == '['){
- scale/=1.01;
+ if(key == ']'){
+ scale*=1.01;
}
- if(key == '}'){
- rotate+=90;
+ if(key == '['){
+ scale/=1.01;
}
- if(key == '{'){
- rotate-=90;
+ if(key == '}'){
+ rotate+=90;
+ }
+ if(key == '{'){
+ rotate-=90;
}
@@ -433,7 +442,7 @@ void testApp::mouseReleased(int x, int y, int button){
}
-void testApp::mousePressed(int x, int y, int button) {
+void testApp::mousePressed(int x, int y, int button) {
}
//--------------------------------------------------------------
@@ -484,41 +493,41 @@ void testApp::mousePressedEvent(ofMouseEventArgs &args) {
void testApp::keyPressedEvent(ofKeyEventArgs &args) {
//printf("window key pressed: %i (%c)\n",args.key,args.key);
keyPressed(args.key);
-}
-
-void testApp::toggleFPS(){
- showFPS=!showFPS;
}
-
+
+void testApp::toggleFPS(){
+ showFPS=!showFPS;
+}
+
void testApp::newMidiMessage(ofxMidiEventArgs& eventArgs){
if ((midiChannel==0)||(eventArgs.channel==midiChannel)) {
nmidiMessage(eventArgs.status,eventArgs.byteOne,eventArgs.byteTwo);
}
-}
-
- //newMessage(eventArgs.port, eventArgs.channel, eventArgs.byteTwo, eventArgs.timestamp);
-
-//byteOne : message type
-
- /*
- int port;
- int channel;
- int status;
- int byteOne;
- int byteTwo;
- double timestamp;
- */
-
- //printf("%d %d %d %d %d\n",eventArgs.port,eventArgs.channel,eventArgs.status,eventArgs.byteOne,eventArgs.byteTwo);
+}
+
+ //newMessage(eventArgs.port, eventArgs.channel, eventArgs.byteTwo, eventArgs.timestamp);
+
+//byteOne : message type
+
+ /*
+ int port;
+ int channel;
+ int status;
+ int byteOne;
+ int byteTwo;
+ double timestamp;
+ */
+
+ //printf("%d %d %d %d %d\n",eventArgs.port,eventArgs.channel,eventArgs.status,eventArgs.byteOne,eventArgs.byteTwo);
void testApp::nmidiMessage(int event,int data1, int data2) {
- if (debug) printf("midi: %i %i\n",event,data1);
- bool noteOn; //this old thing!
- int i;
- switch(event) {
- case 144: //noteon-off channel 0
- noteOn=(data2==0?false:true);
- //for (int i=0;i<numLayers;i++){
- // if (layers[i]->note==eventArgs.byteOne) layers[i]->setActive(noteOn);
+ if (debug) printf("midi: %i %i\n",event,data1);
+ bool noteOn; //this old thing!
+ int i;
+ switch(event) {
+ case 144: //noteon-off channel 0
+ noteOn=(data2==0?false:true);
+ //for (int i=0;i<numLayers;i++){
+ // if (layers[i]->note==eventArgs.byteOne) layers[i]->setActive(noteOn);
//}
note=data1;
@@ -529,19 +538,19 @@ void testApp::nmidiMessage(int event,int data1, int data2) {
// list.layers[itr->first]->setNote(note);
//}
list.layers[note]->setNote(note);
- list.unlock();
+ list.unlock();
}
if (noteRandomiseColours) {
makeColours(); //
}
- randOffs=ofRandom(100.0f);
- break;
- case 176: //control change channel 0
- //for (int i=0;i<numLayers;i++){
- // if (layers[i]->mix==eventArgs.byteOne) layers[i]->setMixAmt(((float)eventArgs.byteTwo)/127.0f);
+ randOffs=ofRandom(100.0f);
+ break;
+ case 176: //control change channel 0
+ //for (int i=0;i<numLayers;i++){
+ // if (layers[i]->mix==eventArgs.byteOne) layers[i]->setMixAmt(((float)eventArgs.byteTwo)/127.0f);
//}
if (debug) printf("cc: %i %i\n",data1,data2);
- if (data1>=START_CONTROLLER) controllers[data1-START_CONTROLLER]=data2;
- }
-}
+ if (data1>=START_CONTROLLER) controllers[data1-START_CONTROLLER]=data2;
+ }
+}
diff --git a/liveengineUnmapped/src/testApp.h b/liveengineUnmapped/src/testApp.h
index 3c9dfc1..4f75656 100755
--- a/liveengineUnmapped/src/testApp.h
+++ b/liveengineUnmapped/src/testApp.h
@@ -177,6 +177,8 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
ofxButton resetFBscale;
ofxIntSlider fS;
ofxParameter<int> fadeScale;
+ ofxIntSlider fB;
+ ofxParameter<int> fadeBackground;
ofxFloatSlider dT;
ofxParameter<float> decayTime;
ofxToggle oscScale;
@@ -200,9 +202,12 @@ class previewWindow: public ofxFensterListener{
public:
~previewWindow();
ofFbo *rb;
+ testApp *parent;
+ void setParent(testApp *p);
void setup();
void setBuffer(ofFbo *buffer);
void draw();
+ void keyPressed(int key, ofxFenster* win);
};
class guiWindow: public ofxFensterListener{
diff --git a/liveengineUnmapped/src/viewport.cpp b/liveengineUnmapped/src/viewport.cpp
index e533ef4..36e7c65 100755
--- a/liveengineUnmapped/src/viewport.cpp
+++ b/liveengineUnmapped/src/viewport.cpp
@@ -24,7 +24,7 @@ void viewport::setup(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy) {
printf("%ix%i, vp offset: %f,%f\n",w,h,-(sin(ofDegToRad(r))*h/2)-(cos(ofDegToRad(r))*w/2),-(sin(ofDegToRad(r))*w/2)-(cos(ofDegToRad(r))*h/2));
}
-void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift){
+void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift,int fadeBG){
@@ -53,6 +53,14 @@ void viewport::draw(float a,unsigned char* controllers,int xshift,int yshift,pla
}
}
+ if (fadeBG<255) {
+ //fadeout part
+ ofEnableAlphaBlending();
+ ofSetColor(0,0,0,fadeBG);
+ ofRect(0,0,ofGetWidth(),ofGetHeight());
+ ofDisableAlphaBlending();
+ }
+
float notewidth=w/NUM_NOTES;
float noteheight=h/NUM_CONTROLLERS;
diff --git a/liveengineUnmapped/src/viewport.h b/liveengineUnmapped/src/viewport.h
index a83cc87..310a7c2 100755
--- a/liveengineUnmapped/src/viewport.h
+++ b/liveengineUnmapped/src/viewport.h
@@ -21,7 +21,7 @@ class viewport
viewport();
viewport(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
void setup(int _w,int _h,int _x,int _y,float _r,int _ox,int _oy);
- void draw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift);
+ void draw(float a,unsigned char* controllers,int xshift,int yshift,playlist &list,bool transparentBlack,int note,int mode,ofColor* controller_colours,bool controlColours,float scale,float fscale,float colShift,int fadeBG);
virtual ~viewport();
ofFbo rb1,rb2;
float r;