From ba7cc94d4ae55e171f0e08126abb0cb13d8f9f8f Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Fri, 31 Aug 2012 09:21:00 +0100 Subject: blocking loading playlists --- liveengine/bin/data/Ag01036x.wmf.svg | 3031 --------- liveengine/bin/data/Bit1120.wmf.svg | 4008 ------------ liveengine/bin/data/Bit1123.wmf.svg | 2773 -------- liveengine/bin/data/Bit1139.wmf.svg | 3751 ----------- liveengine/bin/data/MMA00001.wmf.svg | 3274 ---------- liveengine/bin/data/MMA00002.wmf.svg | 11528 --------------------------------- liveengine/bin/data/MMA00003.wmf.svg | 861 --- liveengine/bin/data/MMA00004.wmf.svg | 552 -- liveengine/bin/data/MMA00005.wmf.svg | 2182 ------- liveengine/bin/data/MMA00006.wmf.svg | 2714 -------- liveengine/bin/data/MMA00007.wmf.svg | 1231 ---- liveengine/bin/data/MMA00008.wmf.svg | 1157 ---- liveengine/bin/data/MMA00009.wmf.svg | 3214 --------- liveengine/bin/data/MMA00010.wmf.svg | 1770 ----- liveengine/bin/data/MMA00011.wmf.svg | 2207 ------- liveengine/bin/data/MMA00012.wmf.svg | 1814 ------ liveengine/bin/data/MMA00013.wmf.svg | 2699 -------- liveengine/bin/data/MMA00014.wmf.svg | 1810 ------ liveengine/bin/data/MMA00015.wmf.svg | 2190 ------- liveengine/bin/data/MMA00016.wmf.svg | 2621 -------- liveengine/bin/data/MMA00017.wmf.svg | 1751 ----- liveengine/bin/data/MMA00018.wmf.svg | 1637 ----- liveengine/bin/data/MMA00019.wmf.svg | 2360 ------- liveengine/bin/data/MMA00020.wmf.svg | 2389 ------- liveengine/bin/data/MMA00021.wmf.svg | 2439 ------- liveengine/bin/data/MMA00022.wmf.svg | 1307 ---- liveengine/bin/data/MMA00023.wmf.svg | 4112 ------------ liveengine/bin/data/MMA00024.wmf.svg | 2140 ------ liveengine/bin/data/MMA00025.wmf.svg | 4040 ------------ liveengine/bin/data/MMA00026.wmf.svg | 3345 ---------- liveengine/bin/data/MMA00027.wmf.svg | 1837 ------ liveengine/bin/data/MMA00028.wmf.svg | 2740 -------- liveengine/bin/data/MMA00029.wmf.svg | 1644 ----- liveengine/bin/data/MMA00030.wmf.svg | 2073 ------ liveengine/bin/data/MMA00031.wmf.svg | 2803 -------- liveengine/bin/data/MMA00032.wmf.svg | 1887 ------ liveengine/bin/data/MMA00033.wmf.svg | 3233 --------- liveengine/bin/data/MMA00034.wmf.svg | 5680 ---------------- liveengine/bin/data/MMA00035.wmf.svg | 5492 ---------------- liveengine/bin/data/MMA00036.wmf.svg | 7285 --------------------- liveengine/bin/data/MMA00037.wmf.svg | 4917 -------------- liveengine/bin/data/MMA00038.wmf.svg | 2981 --------- liveengine/bin/data/MMA00039.wmf.svg | 2980 --------- liveengine/bin/data/MMA00040.wmf.svg | 1744 ----- liveengine/bin/data/MMA00041.wmf.svg | 1826 ------ liveengine/bin/data/MMA00042.wmf.svg | 2402 ------- liveengine/bin/data/MMA00043.wmf.svg | 3229 --------- liveengine/bin/data/MMA00044.wmf.svg | 619 -- liveengine/bin/data/MMA00045.wmf.svg | 820 --- liveengine/bin/data/MMA00046.wmf.svg | 3893 ----------- liveengine/bin/data/MMA00047.wmf.svg | 1752 ----- liveengine/bin/data/MMA00048.wmf.svg | 3658 ----------- liveengine/bin/data/MMA00049.wmf.svg | 1013 --- liveengine/bin/data/MMA00050.wmf.svg | 2829 -------- liveengine/bin/data/MMA00051.wmf.svg | 2140 ------ liveengine/bin/data/MMA00052.wmf.svg | 2758 -------- liveengine/bin/data/ag01501a.wmf.svg | 2039 ------ liveengine/bin/data/ag01502a.wmf.svg | 1748 ----- liveengine/bin/data/ag01503a.wmf.svg | 2118 ------ liveengine/bin/data/ag01504a.wmf.svg | 1857 ------ liveengine/bin/data/ag01505a.wmf.svg | 1871 ------ liveengine/bin/data/ag01506a.wmf.svg | 2128 ------ liveengine/bin/data/ag01507a.wmf.svg | 3253 ---------- liveengine/bin/data/ag35003b.wmf.svg | 2450 ------- liveengine/bin/data/ag35004b.wmf.svg | 2186 ------- liveengine/bin/data/ah01512a.wmf.svg | 4475 ------------- liveengine/bin/data/settings.xml | 54 - liveengine/liveengine.cbp | 7 + liveengine/liveengine.layout | 29 +- liveengine/src/layers.cpp | 34 +- liveengine/src/layers.h | 20 +- liveengine/src/main.cpp | 2 +- liveengine/src/testApp.cpp | 130 +- liveengine/src/testApp.h | 32 +- 74 files changed, 199 insertions(+), 179376 deletions(-) delete mode 100644 liveengine/bin/data/Ag01036x.wmf.svg delete mode 100644 liveengine/bin/data/Bit1120.wmf.svg delete mode 100644 liveengine/bin/data/Bit1123.wmf.svg delete mode 100644 liveengine/bin/data/Bit1139.wmf.svg delete mode 100644 liveengine/bin/data/MMA00001.wmf.svg delete mode 100644 liveengine/bin/data/MMA00002.wmf.svg delete mode 100644 liveengine/bin/data/MMA00003.wmf.svg delete mode 100644 liveengine/bin/data/MMA00004.wmf.svg delete mode 100644 liveengine/bin/data/MMA00005.wmf.svg delete mode 100644 liveengine/bin/data/MMA00006.wmf.svg delete mode 100644 liveengine/bin/data/MMA00007.wmf.svg delete mode 100644 liveengine/bin/data/MMA00008.wmf.svg delete mode 100644 liveengine/bin/data/MMA00009.wmf.svg delete mode 100644 liveengine/bin/data/MMA00010.wmf.svg delete mode 100644 liveengine/bin/data/MMA00011.wmf.svg delete mode 100644 liveengine/bin/data/MMA00012.wmf.svg delete mode 100644 liveengine/bin/data/MMA00013.wmf.svg delete mode 100644 liveengine/bin/data/MMA00014.wmf.svg delete mode 100644 liveengine/bin/data/MMA00015.wmf.svg delete mode 100644 liveengine/bin/data/MMA00016.wmf.svg delete mode 100644 liveengine/bin/data/MMA00017.wmf.svg delete mode 100644 liveengine/bin/data/MMA00018.wmf.svg delete mode 100644 liveengine/bin/data/MMA00019.wmf.svg delete mode 100644 liveengine/bin/data/MMA00020.wmf.svg delete mode 100644 liveengine/bin/data/MMA00021.wmf.svg delete mode 100644 liveengine/bin/data/MMA00022.wmf.svg delete mode 100644 liveengine/bin/data/MMA00023.wmf.svg delete mode 100644 liveengine/bin/data/MMA00024.wmf.svg delete mode 100644 liveengine/bin/data/MMA00025.wmf.svg delete mode 100644 liveengine/bin/data/MMA00026.wmf.svg delete mode 100644 liveengine/bin/data/MMA00027.wmf.svg delete mode 100644 liveengine/bin/data/MMA00028.wmf.svg delete mode 100644 liveengine/bin/data/MMA00029.wmf.svg delete mode 100644 liveengine/bin/data/MMA00030.wmf.svg delete mode 100644 liveengine/bin/data/MMA00031.wmf.svg delete mode 100644 liveengine/bin/data/MMA00032.wmf.svg delete mode 100644 liveengine/bin/data/MMA00033.wmf.svg delete mode 100644 liveengine/bin/data/MMA00034.wmf.svg delete mode 100644 liveengine/bin/data/MMA00035.wmf.svg delete mode 100644 liveengine/bin/data/MMA00036.wmf.svg delete mode 100644 liveengine/bin/data/MMA00037.wmf.svg delete mode 100644 liveengine/bin/data/MMA00038.wmf.svg delete mode 100644 liveengine/bin/data/MMA00039.wmf.svg delete mode 100644 liveengine/bin/data/MMA00040.wmf.svg delete mode 100644 liveengine/bin/data/MMA00041.wmf.svg delete mode 100644 liveengine/bin/data/MMA00042.wmf.svg delete mode 100644 liveengine/bin/data/MMA00043.wmf.svg delete mode 100644 liveengine/bin/data/MMA00044.wmf.svg delete mode 100644 liveengine/bin/data/MMA00045.wmf.svg delete mode 100644 liveengine/bin/data/MMA00046.wmf.svg delete mode 100644 liveengine/bin/data/MMA00047.wmf.svg delete mode 100644 liveengine/bin/data/MMA00048.wmf.svg delete mode 100644 liveengine/bin/data/MMA00049.wmf.svg delete mode 100644 liveengine/bin/data/MMA00050.wmf.svg delete mode 100644 liveengine/bin/data/MMA00051.wmf.svg delete mode 100644 liveengine/bin/data/MMA00052.wmf.svg delete mode 100644 liveengine/bin/data/ag01501a.wmf.svg delete mode 100644 liveengine/bin/data/ag01502a.wmf.svg delete mode 100644 liveengine/bin/data/ag01503a.wmf.svg delete mode 100644 liveengine/bin/data/ag01504a.wmf.svg delete mode 100644 liveengine/bin/data/ag01505a.wmf.svg delete mode 100644 liveengine/bin/data/ag01506a.wmf.svg delete mode 100644 liveengine/bin/data/ag01507a.wmf.svg delete mode 100644 liveengine/bin/data/ag35003b.wmf.svg delete mode 100644 liveengine/bin/data/ag35004b.wmf.svg delete mode 100644 liveengine/bin/data/ah01512a.wmf.svg diff --git a/liveengine/bin/data/Ag01036x.wmf.svg b/liveengine/bin/data/Ag01036x.wmf.svg deleted file mode 100644 index a521f10..0000000 --- a/liveengine/bin/data/Ag01036x.wmf.svg +++ /dev/null @@ -1,3031 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/Bit1120.wmf.svg b/liveengine/bin/data/Bit1120.wmf.svg deleted file mode 100644 index 344eac8..0000000 --- a/liveengine/bin/data/Bit1120.wmf.svg +++ /dev/null @@ -1,4008 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/Bit1123.wmf.svg b/liveengine/bin/data/Bit1123.wmf.svg deleted file mode 100644 index 6f654b6..0000000 --- a/liveengine/bin/data/Bit1123.wmf.svg +++ /dev/null @@ -1,2773 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/Bit1139.wmf.svg b/liveengine/bin/data/Bit1139.wmf.svg deleted file mode 100644 index b4e606f..0000000 --- a/liveengine/bin/data/Bit1139.wmf.svg +++ /dev/null @@ -1,3751 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00001.wmf.svg b/liveengine/bin/data/MMA00001.wmf.svg deleted file mode 100644 index 513d333..0000000 --- a/liveengine/bin/data/MMA00001.wmf.svg +++ /dev/null @@ -1,3274 +0,0 @@ - - - -wmf2svg - - - - - - - - - diff --git a/liveengine/bin/data/MMA00002.wmf.svg b/liveengine/bin/data/MMA00002.wmf.svg deleted file mode 100644 index 22eeffc..0000000 --- a/liveengine/bin/data/MMA00002.wmf.svg +++ /dev/null @@ -1,11528 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00003.wmf.svg b/liveengine/bin/data/MMA00003.wmf.svg deleted file mode 100644 index d75de4d..0000000 --- a/liveengine/bin/data/MMA00003.wmf.svg +++ /dev/null @@ -1,861 +0,0 @@ - - - -wmf2svg - - - - - diff --git a/liveengine/bin/data/MMA00004.wmf.svg b/liveengine/bin/data/MMA00004.wmf.svg deleted file mode 100644 index 1a28057..0000000 --- a/liveengine/bin/data/MMA00004.wmf.svg +++ /dev/null @@ -1,552 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00005.wmf.svg b/liveengine/bin/data/MMA00005.wmf.svg deleted file mode 100644 index 9634980..0000000 --- a/liveengine/bin/data/MMA00005.wmf.svg +++ /dev/null @@ -1,2182 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00006.wmf.svg b/liveengine/bin/data/MMA00006.wmf.svg deleted file mode 100644 index 8807836..0000000 --- a/liveengine/bin/data/MMA00006.wmf.svg +++ /dev/null @@ -1,2714 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00007.wmf.svg b/liveengine/bin/data/MMA00007.wmf.svg deleted file mode 100644 index 2eef92b..0000000 --- a/liveengine/bin/data/MMA00007.wmf.svg +++ /dev/null @@ -1,1231 +0,0 @@ - - - -wmf2svg - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00008.wmf.svg b/liveengine/bin/data/MMA00008.wmf.svg deleted file mode 100644 index fbd5930..0000000 --- a/liveengine/bin/data/MMA00008.wmf.svg +++ /dev/null @@ -1,1157 +0,0 @@ - - - -wmf2svg - - - - - - diff --git a/liveengine/bin/data/MMA00009.wmf.svg b/liveengine/bin/data/MMA00009.wmf.svg deleted file mode 100644 index 6bac56a..0000000 --- a/liveengine/bin/data/MMA00009.wmf.svg +++ /dev/null @@ -1,3214 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00010.wmf.svg b/liveengine/bin/data/MMA00010.wmf.svg deleted file mode 100644 index 36af370..0000000 --- a/liveengine/bin/data/MMA00010.wmf.svg +++ /dev/null @@ -1,1770 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00011.wmf.svg b/liveengine/bin/data/MMA00011.wmf.svg deleted file mode 100644 index 8fc374d..0000000 --- a/liveengine/bin/data/MMA00011.wmf.svg +++ /dev/null @@ -1,2207 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00012.wmf.svg b/liveengine/bin/data/MMA00012.wmf.svg deleted file mode 100644 index 9a096cd..0000000 --- a/liveengine/bin/data/MMA00012.wmf.svg +++ /dev/null @@ -1,1814 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00013.wmf.svg b/liveengine/bin/data/MMA00013.wmf.svg deleted file mode 100644 index ddae606..0000000 --- a/liveengine/bin/data/MMA00013.wmf.svg +++ /dev/null @@ -1,2699 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00014.wmf.svg b/liveengine/bin/data/MMA00014.wmf.svg deleted file mode 100644 index 112cd75..0000000 --- a/liveengine/bin/data/MMA00014.wmf.svg +++ /dev/null @@ -1,1810 +0,0 @@ - - - -wmf2svg - - - - - - - - - diff --git a/liveengine/bin/data/MMA00015.wmf.svg b/liveengine/bin/data/MMA00015.wmf.svg deleted file mode 100644 index 196b57e..0000000 --- a/liveengine/bin/data/MMA00015.wmf.svg +++ /dev/null @@ -1,2190 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00016.wmf.svg b/liveengine/bin/data/MMA00016.wmf.svg deleted file mode 100644 index d4fba08..0000000 --- a/liveengine/bin/data/MMA00016.wmf.svg +++ /dev/null @@ -1,2621 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00017.wmf.svg b/liveengine/bin/data/MMA00017.wmf.svg deleted file mode 100644 index 465b0c4..0000000 --- a/liveengine/bin/data/MMA00017.wmf.svg +++ /dev/null @@ -1,1751 +0,0 @@ - - - -wmf2svg - - - - - - diff --git a/liveengine/bin/data/MMA00018.wmf.svg b/liveengine/bin/data/MMA00018.wmf.svg deleted file mode 100644 index 7f6db95..0000000 --- a/liveengine/bin/data/MMA00018.wmf.svg +++ /dev/null @@ -1,1637 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00019.wmf.svg b/liveengine/bin/data/MMA00019.wmf.svg deleted file mode 100644 index d28650e..0000000 --- a/liveengine/bin/data/MMA00019.wmf.svg +++ /dev/null @@ -1,2360 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00020.wmf.svg b/liveengine/bin/data/MMA00020.wmf.svg deleted file mode 100644 index dcd06b8..0000000 --- a/liveengine/bin/data/MMA00020.wmf.svg +++ /dev/null @@ -1,2389 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00021.wmf.svg b/liveengine/bin/data/MMA00021.wmf.svg deleted file mode 100644 index 8bf6f68..0000000 --- a/liveengine/bin/data/MMA00021.wmf.svg +++ /dev/null @@ -1,2439 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00022.wmf.svg b/liveengine/bin/data/MMA00022.wmf.svg deleted file mode 100644 index fcb42cf..0000000 --- a/liveengine/bin/data/MMA00022.wmf.svg +++ /dev/null @@ -1,1307 +0,0 @@ - - - -wmf2svg - - - - - - - - - diff --git a/liveengine/bin/data/MMA00023.wmf.svg b/liveengine/bin/data/MMA00023.wmf.svg deleted file mode 100644 index ea57cae..0000000 --- a/liveengine/bin/data/MMA00023.wmf.svg +++ /dev/null @@ -1,4112 +0,0 @@ - - - -wmf2svg - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00024.wmf.svg b/liveengine/bin/data/MMA00024.wmf.svg deleted file mode 100644 index ebc2917..0000000 --- a/liveengine/bin/data/MMA00024.wmf.svg +++ /dev/null @@ -1,2140 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00025.wmf.svg b/liveengine/bin/data/MMA00025.wmf.svg deleted file mode 100644 index c22e486..0000000 --- a/liveengine/bin/data/MMA00025.wmf.svg +++ /dev/null @@ -1,4040 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00026.wmf.svg b/liveengine/bin/data/MMA00026.wmf.svg deleted file mode 100644 index 3b82cd4..0000000 --- a/liveengine/bin/data/MMA00026.wmf.svg +++ /dev/null @@ -1,3345 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00027.wmf.svg b/liveengine/bin/data/MMA00027.wmf.svg deleted file mode 100644 index bdc4de7..0000000 --- a/liveengine/bin/data/MMA00027.wmf.svg +++ /dev/null @@ -1,1837 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00028.wmf.svg b/liveengine/bin/data/MMA00028.wmf.svg deleted file mode 100644 index 976ddcb..0000000 --- a/liveengine/bin/data/MMA00028.wmf.svg +++ /dev/null @@ -1,2740 +0,0 @@ - - - -wmf2svg - - - - - - - - - diff --git a/liveengine/bin/data/MMA00029.wmf.svg b/liveengine/bin/data/MMA00029.wmf.svg deleted file mode 100644 index ebf2f17..0000000 --- a/liveengine/bin/data/MMA00029.wmf.svg +++ /dev/null @@ -1,1644 +0,0 @@ - - - -wmf2svg - - - - - - - - - diff --git a/liveengine/bin/data/MMA00030.wmf.svg b/liveengine/bin/data/MMA00030.wmf.svg deleted file mode 100644 index e7fae24..0000000 --- a/liveengine/bin/data/MMA00030.wmf.svg +++ /dev/null @@ -1,2073 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00031.wmf.svg b/liveengine/bin/data/MMA00031.wmf.svg deleted file mode 100644 index 5d92f2e..0000000 --- a/liveengine/bin/data/MMA00031.wmf.svg +++ /dev/null @@ -1,2803 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00032.wmf.svg b/liveengine/bin/data/MMA00032.wmf.svg deleted file mode 100644 index d5a3a3d..0000000 --- a/liveengine/bin/data/MMA00032.wmf.svg +++ /dev/null @@ -1,1887 +0,0 @@ - - - -wmf2svg - - - - - - diff --git a/liveengine/bin/data/MMA00033.wmf.svg b/liveengine/bin/data/MMA00033.wmf.svg deleted file mode 100644 index 4c9b288..0000000 --- a/liveengine/bin/data/MMA00033.wmf.svg +++ /dev/null @@ -1,3233 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00034.wmf.svg b/liveengine/bin/data/MMA00034.wmf.svg deleted file mode 100644 index ff5d463..0000000 --- a/liveengine/bin/data/MMA00034.wmf.svg +++ /dev/null @@ -1,5680 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00035.wmf.svg b/liveengine/bin/data/MMA00035.wmf.svg deleted file mode 100644 index d4f1519..0000000 --- a/liveengine/bin/data/MMA00035.wmf.svg +++ /dev/null @@ -1,5492 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00036.wmf.svg b/liveengine/bin/data/MMA00036.wmf.svg deleted file mode 100644 index 69e3cde..0000000 --- a/liveengine/bin/data/MMA00036.wmf.svg +++ /dev/null @@ -1,7285 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00037.wmf.svg b/liveengine/bin/data/MMA00037.wmf.svg deleted file mode 100644 index 9234de3..0000000 --- a/liveengine/bin/data/MMA00037.wmf.svg +++ /dev/null @@ -1,4917 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00038.wmf.svg b/liveengine/bin/data/MMA00038.wmf.svg deleted file mode 100644 index d128c29..0000000 --- a/liveengine/bin/data/MMA00038.wmf.svg +++ /dev/null @@ -1,2981 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00039.wmf.svg b/liveengine/bin/data/MMA00039.wmf.svg deleted file mode 100644 index 2493aa2..0000000 --- a/liveengine/bin/data/MMA00039.wmf.svg +++ /dev/null @@ -1,2980 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00040.wmf.svg b/liveengine/bin/data/MMA00040.wmf.svg deleted file mode 100644 index 29c0e5b..0000000 --- a/liveengine/bin/data/MMA00040.wmf.svg +++ /dev/null @@ -1,1744 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00041.wmf.svg b/liveengine/bin/data/MMA00041.wmf.svg deleted file mode 100644 index 1e58bd1..0000000 --- a/liveengine/bin/data/MMA00041.wmf.svg +++ /dev/null @@ -1,1826 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00042.wmf.svg b/liveengine/bin/data/MMA00042.wmf.svg deleted file mode 100644 index bbf8f83..0000000 --- a/liveengine/bin/data/MMA00042.wmf.svg +++ /dev/null @@ -1,2402 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/MMA00043.wmf.svg b/liveengine/bin/data/MMA00043.wmf.svg deleted file mode 100644 index 3ecb424..0000000 --- a/liveengine/bin/data/MMA00043.wmf.svg +++ /dev/null @@ -1,3229 +0,0 @@ - - - -wmf2svg - - - - - diff --git a/liveengine/bin/data/MMA00044.wmf.svg b/liveengine/bin/data/MMA00044.wmf.svg deleted file mode 100644 index c26d6bf..0000000 --- a/liveengine/bin/data/MMA00044.wmf.svg +++ /dev/null @@ -1,619 +0,0 @@ - - - -wmf2svg - - - - diff --git a/liveengine/bin/data/MMA00045.wmf.svg b/liveengine/bin/data/MMA00045.wmf.svg deleted file mode 100644 index e09519c..0000000 --- a/liveengine/bin/data/MMA00045.wmf.svg +++ /dev/null @@ -1,820 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00046.wmf.svg b/liveengine/bin/data/MMA00046.wmf.svg deleted file mode 100644 index 2eabfe7..0000000 --- a/liveengine/bin/data/MMA00046.wmf.svg +++ /dev/null @@ -1,3893 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00047.wmf.svg b/liveengine/bin/data/MMA00047.wmf.svg deleted file mode 100644 index dc31db8..0000000 --- a/liveengine/bin/data/MMA00047.wmf.svg +++ /dev/null @@ -1,1752 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00048.wmf.svg b/liveengine/bin/data/MMA00048.wmf.svg deleted file mode 100644 index 1999ee0..0000000 --- a/liveengine/bin/data/MMA00048.wmf.svg +++ /dev/null @@ -1,3658 +0,0 @@ - - - -wmf2svg - - - - - - diff --git a/liveengine/bin/data/MMA00049.wmf.svg b/liveengine/bin/data/MMA00049.wmf.svg deleted file mode 100644 index 9c91ef5..0000000 --- a/liveengine/bin/data/MMA00049.wmf.svg +++ /dev/null @@ -1,1013 +0,0 @@ - - - -wmf2svg - - - diff --git a/liveengine/bin/data/MMA00050.wmf.svg b/liveengine/bin/data/MMA00050.wmf.svg deleted file mode 100644 index edbc76a..0000000 --- a/liveengine/bin/data/MMA00050.wmf.svg +++ /dev/null @@ -1,2829 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/MMA00051.wmf.svg b/liveengine/bin/data/MMA00051.wmf.svg deleted file mode 100644 index dc31d51..0000000 --- a/liveengine/bin/data/MMA00051.wmf.svg +++ /dev/null @@ -1,2140 +0,0 @@ - - - -wmf2svg - - - - - - - diff --git a/liveengine/bin/data/MMA00052.wmf.svg b/liveengine/bin/data/MMA00052.wmf.svg deleted file mode 100644 index 9f85c31..0000000 --- a/liveengine/bin/data/MMA00052.wmf.svg +++ /dev/null @@ -1,2758 +0,0 @@ - - - -wmf2svg - - - - - - - - diff --git a/liveengine/bin/data/ag01501a.wmf.svg b/liveengine/bin/data/ag01501a.wmf.svg deleted file mode 100644 index fcbb134..0000000 --- a/liveengine/bin/data/ag01501a.wmf.svg +++ /dev/null @@ -1,2039 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/ag01502a.wmf.svg b/liveengine/bin/data/ag01502a.wmf.svg deleted file mode 100644 index a97e59c..0000000 --- a/liveengine/bin/data/ag01502a.wmf.svg +++ /dev/null @@ -1,1748 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/ag01503a.wmf.svg b/liveengine/bin/data/ag01503a.wmf.svg deleted file mode 100644 index 5e61fb5..0000000 --- a/liveengine/bin/data/ag01503a.wmf.svg +++ /dev/null @@ -1,2118 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/ag01504a.wmf.svg b/liveengine/bin/data/ag01504a.wmf.svg deleted file mode 100644 index 982a50a..0000000 --- a/liveengine/bin/data/ag01504a.wmf.svg +++ /dev/null @@ -1,1857 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/ag01505a.wmf.svg b/liveengine/bin/data/ag01505a.wmf.svg deleted file mode 100644 index bc8ae1c..0000000 --- a/liveengine/bin/data/ag01505a.wmf.svg +++ /dev/null @@ -1,1871 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/ag01506a.wmf.svg b/liveengine/bin/data/ag01506a.wmf.svg deleted file mode 100644 index ac47991..0000000 --- a/liveengine/bin/data/ag01506a.wmf.svg +++ /dev/null @@ -1,2128 +0,0 @@ - - - -wmf2svg - - - - - - - - - diff --git a/liveengine/bin/data/ag01507a.wmf.svg b/liveengine/bin/data/ag01507a.wmf.svg deleted file mode 100644 index 806f05b..0000000 --- a/liveengine/bin/data/ag01507a.wmf.svg +++ /dev/null @@ -1,3253 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/ag35003b.wmf.svg b/liveengine/bin/data/ag35003b.wmf.svg deleted file mode 100644 index 4ced243..0000000 --- a/liveengine/bin/data/ag35003b.wmf.svg +++ /dev/null @@ -1,2450 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/ag35004b.wmf.svg b/liveengine/bin/data/ag35004b.wmf.svg deleted file mode 100644 index 4c1f23a..0000000 --- a/liveengine/bin/data/ag35004b.wmf.svg +++ /dev/null @@ -1,2186 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/ah01512a.wmf.svg b/liveengine/bin/data/ah01512a.wmf.svg deleted file mode 100644 index 2c04e19..0000000 --- a/liveengine/bin/data/ah01512a.wmf.svg +++ /dev/null @@ -1,4475 +0,0 @@ - - - -wmf2svg - - - - - - - - - - - - - - - diff --git a/liveengine/bin/data/settings.xml b/liveengine/bin/data/settings.xml index d61470e..68896b8 100755 --- a/liveengine/bin/data/settings.xml +++ b/liveengine/bin/data/settings.xml @@ -1,58 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/liveengine/liveengine.cbp b/liveengine/liveengine.cbp index 53199ec..db4e112 100644 --- a/liveengine/liveengine.cbp +++ b/liveengine/liveengine.cbp @@ -34,12 +34,19 @@ + + + + + diff --git a/liveengine/liveengine.layout b/liveengine/liveengine.layout index e9c4ac6..bad1fb4 100644 --- a/liveengine/liveengine.layout +++ b/liveengine/liveengine.layout @@ -1,25 +1,34 @@ - - + + - + - - + + - + + + + + + + + + + - - + + - - + + diff --git a/liveengine/src/layers.cpp b/liveengine/src/layers.cpp index dbf6ccd..f140073 100644 --- a/liveengine/src/layers.cpp +++ b/liveengine/src/layers.cpp @@ -9,7 +9,7 @@ layer::layer(string _f) void layer::load(string _f){ } -void layer::draw() { +void layer::draw(float a) { } @@ -28,16 +28,42 @@ svglayer::svglayer(string _f) void svglayer::load(string _f){ svg.load(_f); printf("%i paths\n",svg.getNumPath()); - for (int i=0;i fills; + vector strokes; }; +class imglayer: public layer +{ + public: + imglayer(); + imglayer(string _f); + virtual ~imglayer(); + void load(string _f); + void draw(float a); + protected: + private: + ofImage img; +}; #endif // SVGLAYER_H diff --git a/liveengine/src/main.cpp b/liveengine/src/main.cpp index 41470a2..5c556af 100644 --- a/liveengine/src/main.cpp +++ b/liveengine/src/main.cpp @@ -6,7 +6,7 @@ int main( ){ ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context + ofSetupOpenGL(&window, 800,600, OF_WINDOW); // <-------- setup the GL context //ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // this kicks off the running of my app diff --git a/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp index 9a84eda..ee89f6a 100755 --- a/liveengine/src/testApp.cpp +++ b/liveengine/src/testApp.cpp @@ -1,11 +1,39 @@ #include "testApp.h" - +void testApp::loadplaylist(string _name){ + int numLayers=0; + layers.clear(); + if( !XML.loadFile(_name) ){ + printf("unable to load %s check data/ folder\n",_name.c_str()); + }else{ + if(XML.pushTag("playlist")) { + numLayers=XML.getNumTags("svglayer"); + if(numLayers) { + for (int i=0;i>7,(controller_colours[i].g*controllers[i])>>7,(controller_colours[i].b*controllers[i])>>7)); - ofRect(note*notewidth,i*noteheight,notewidth,noteheight); + float lamda=max(0.0f,1.0f-((ofGetElapsedTimef()-lastnoteTime)/decayTime)); + + if (note>0) { + switch(mode) { + case BLOCKS: + for (int i=0;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; + case LIST: + ofPushMatrix(); + //ofScale(sin(ofGetElapsedTimef())+1.1,sin(ofGetElapsedTimef())+1.1); + if (layers.find(note)!=layers.end()) layers[note]->draw(lamda); + ofPopMatrix(); + break; + } } - ofSetColor((sin(ofGetElapsedTimef())+1)*128,255,255); - ofPushMatrix(); - //ofScale(sin(ofGetElapsedTimef())+1.1,sin(ofGetElapsedTimef())+1.1); - if (layers.find(note)!=layers.end()) layers[note]->draw(); - ofPopMatrix(); //for (int i=0;idraw(); ofSetColor(255,255,255); @@ -92,13 +125,41 @@ void testApp::draw(){ //-------------------------------------------------------------- void testApp::keyPressed (int key){ + if(key == 'q'){ + loadplaylist("insects.xml"); + } + if(key == 'w'){ + loadplaylist("barcelona.xml"); + } + if(key == 'e'){ + loadplaylist("organs.xml"); + } + if(key == 'r'){ + loadplaylist("tai_chi.xml"); + } 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 == OF_KEY_LEFT){ + xshift--; + } + if(key == OF_KEY_RIGHT){ + xshift++; + } + if(key == OF_KEY_DOWN){ + yshift--; + } + if(key == OF_KEY_UP){ + yshift++; + } + } //-------------------------------------------------------------- @@ -170,7 +231,8 @@ void testApp::newMidiMessage(ofxMidiEventArgs& eventArgs){ // if (layers[i]->note==eventArgs.byteOne) layers[i]->setActive(noteOn); //} printf("note: %i %i\n",eventArgs.byteOne,eventArgs.byteTwo); - note=eventArgs.byteOne-START_NOTE; + note=eventArgs.byteOne; + lastnoteTime=ofGetElapsedTimef(); break; case 176: //control change channel 0 //for (int i=0;i layers; + }; -- cgit v1.2.3