From 415b8a46c0c8e0046c2f6b885a48fe65fde03e47 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 16 Jul 2007 10:21:40 +0000 Subject: [PATCH] --- extras/juce demo/src/BinaryData.cpp | 278 +++++++++--------- extras/juce demo/src/BinaryData.h | 2 +- .../src/binarydata/FontsAndTextDemo.cpp | 2 +- src/juce_core/threads/juce_ThreadPool.cpp | 6 +- src/juce_core/threads/juce_ThreadPool.h | 7 +- 5 files changed, 151 insertions(+), 144 deletions(-) diff --git a/extras/juce demo/src/BinaryData.cpp b/extras/juce demo/src/BinaryData.cpp index 34a5efd981..a133610e92 100644 --- a/extras/juce demo/src/BinaryData.cpp +++ b/extras/juce demo/src/BinaryData.cpp @@ -2164,153 +2164,153 @@ static const unsigned char temp5[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61, 45,62,97,100,100,66,117,116,116,111,110,76,105,115,116,101,110,101,114,32,40,116,104,105,115,41,59,13,10,13,10,32,32,32,32,32,32,32,32,97, 100,100,65,110,100,77,97,107,101,86,105,115,105,98,108,101,32,40,115,105,122,101,83,108,105,100,101,114,32,61,32,110,101,119,32,83,108,105,100,101, 114,32,40,84,40,34,115,105,122,101,34,41,41,41,59,13,10,32,32,32,32,32,32,32,32,115,105,122,101,83,108,105,100,101,114,45,62,115,101,116, - 82,97,110,103,101,32,40,51,46,48,44,32,53,48,46,48,44,32,48,46,49,41,59,13,10,32,32,32,32,32,32,32,32,115,105,122,101,83,108,105, - 100,101,114,45,62,115,101,116,86,97,108,117,101,32,40,50,48,46,48,41,59,13,10,32,32,32,32,32,32,32,32,115,105,122,101,83,108,105,100,101, - 114,45,62,97,100,100,76,105,115,116,101,110,101,114,32,40,116,104,105,115,41,59,13,10,13,10,32,32,32,32,32,32,32,32,108,105,115,116,66,111, - 120,45,62,115,101,108,101,99,116,82,111,119,32,40,48,41,59,13,10,32,32,32,32,32,32,32,32,108,105,115,116,66,111,120,45,62,115,101,116,67, - 111,108,111,117,114,32,40,76,105,115,116,66,111,120,58,58,111,117,116,108,105,110,101,67,111,108,111,117,114,73,100,44,32,67,111,108,111,117,114,115, - 58,58,98,108,97,99,107,46,119,105,116,104,65,108,112,104,97,32,40,48,46,53,102,41,41,59,13,10,32,32,32,32,32,32,32,32,108,105,115,116, - 66,111,120,45,62,115,101,116,79,117,116,108,105,110,101,84,104,105,99,107,110,101,115,115,32,40,49,41,59,13,10,13,10,32,32,32,32,32,32,32, - 32,47,47,32,115,101,116,32,117,112,32,116,104,101,32,108,97,121,111,117,116,32,97,110,100,32,114,101,115,105,122,101,114,32,98,97,114,115,46,46, - 13,10,13,10,32,32,32,32,32,32,32,32,118,101,114,116,105,99,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116, - 32,40,48,44,32,45,48,46,50,44,32,45,48,46,56,44,32,45,48,46,53,41,59,32,32,47,47,32,119,105,100,116,104,32,111,102,32,116,104,101, - 32,102,111,110,116,32,108,105,115,116,32,109,117,115,116,32,98,101,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 82,97,110,103,101,32,40,51,46,48,44,32,49,53,48,46,48,44,32,48,46,49,41,59,13,10,32,32,32,32,32,32,32,32,115,105,122,101,83,108, + 105,100,101,114,45,62,115,101,116,86,97,108,117,101,32,40,50,48,46,48,41,59,13,10,32,32,32,32,32,32,32,32,115,105,122,101,83,108,105,100, + 101,114,45,62,97,100,100,76,105,115,116,101,110,101,114,32,40,116,104,105,115,41,59,13,10,13,10,32,32,32,32,32,32,32,32,108,105,115,116,66, + 111,120,45,62,115,101,108,101,99,116,82,111,119,32,40,48,41,59,13,10,32,32,32,32,32,32,32,32,108,105,115,116,66,111,120,45,62,115,101,116, + 67,111,108,111,117,114,32,40,76,105,115,116,66,111,120,58,58,111,117,116,108,105,110,101,67,111,108,111,117,114,73,100,44,32,67,111,108,111,117,114, + 115,58,58,98,108,97,99,107,46,119,105,116,104,65,108,112,104,97,32,40,48,46,53,102,41,41,59,13,10,32,32,32,32,32,32,32,32,108,105,115, + 116,66,111,120,45,62,115,101,116,79,117,116,108,105,110,101,84,104,105,99,107,110,101,115,115,32,40,49,41,59,13,10,13,10,32,32,32,32,32,32, + 32,32,47,47,32,115,101,116,32,117,112,32,116,104,101,32,108,97,121,111,117,116,32,97,110,100,32,114,101,115,105,122,101,114,32,98,97,114,115,46, + 46,13,10,13,10,32,32,32,32,32,32,32,32,118,101,114,116,105,99,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117, + 116,32,40,48,44,32,45,48,46,50,44,32,45,48,46,56,44,32,45,48,46,53,41,59,32,32,47,47,32,119,105,100,116,104,32,111,102,32,116,104, + 101,32,102,111,110,116,32,108,105,115,116,32,109,117,115,116,32,98,101,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,47,47,32,98,101,116,119,101,101,110,32,50,48,37,32,97,110,100,32,56,48,37,44,32,112,114,101,102,101,114,97,98,108,121,32,53,48,37,13, - 10,32,32,32,32,32,32,32,32,118,101,114,116,105,99,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,49, - 44,32,56,44,32,56,44,32,56,41,59,32,32,32,32,32,32,32,32,32,32,32,47,47,32,116,104,101,32,118,101,114,116,105,99,97,108,32,100,105, - 118,105,100,101,114,32,100,114,97,103,45,98,97,114,32,116,104,105,110,103,32,105,115,32,97,108,119,97,121,115,32,56,32,112,105,120,101,108,115,32, - 119,105,100,101,13,10,32,32,32,32,32,32,32,32,118,101,114,116,105,99,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111, - 117,116,32,40,50,44,32,49,53,48,44,32,45,49,46,48,44,32,45,48,46,53,41,59,32,32,32,47,47,32,116,104,101,32,99,111,109,112,111,110, - 101,110,116,115,32,111,110,32,116,104,101,32,114,105,103,104,116,32,109,117,115,116,32,98,101,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,47,47,32,98,101,116,119,101,101,110,32,50,48,37,32,97,110,100,32,56,48,37,44,32,112,114,101,102,101,114,97,98,108,121,32,53,48,37, + 13,10,32,32,32,32,32,32,32,32,118,101,114,116,105,99,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40, + 49,44,32,56,44,32,56,44,32,56,41,59,32,32,32,32,32,32,32,32,32,32,32,47,47,32,116,104,101,32,118,101,114,116,105,99,97,108,32,100, + 105,118,105,100,101,114,32,100,114,97,103,45,98,97,114,32,116,104,105,110,103,32,105,115,32,97,108,119,97,121,115,32,56,32,112,105,120,101,108,115, + 32,119,105,100,101,13,10,32,32,32,32,32,32,32,32,118,101,114,116,105,99,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121, + 111,117,116,32,40,50,44,32,49,53,48,44,32,45,49,46,48,44,32,45,48,46,53,41,59,32,32,32,47,47,32,116,104,101,32,99,111,109,112,111, + 110,101,110,116,115,32,111,110,32,116,104,101,32,114,105,103,104,116,32,109,117,115,116,32,98,101,13,10,32,32,32,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,47,47,32,97,116,32,108,101,97,115,116,32,49,53,48,32,112,105,120,101,108,115,32,119,105,100,101,44,32,112,114,101, - 102,101,114,97,98,108,121,32,53,48,37,32,111,102,32,116,104,101,32,116,111,116,97,108,32,119,105,100,116,104,13,10,13,10,32,32,32,32,32,32, - 32,32,118,101,114,116,105,99,97,108,68,105,118,105,100,101,114,66,97,114,32,61,32,110,101,119,32,83,116,114,101,116,99,104,97,98,108,101,76,97, - 121,111,117,116,82,101,115,105,122,101,114,66,97,114,32,40,38,118,101,114,116,105,99,97,108,76,97,121,111,117,116,44,32,49,44,32,116,114,117,101, - 41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,101,86,105,115,105,98,108,101,32,40,118,101,114,116,105,99,97,108,68, - 105,118,105,100,101,114,66,97,114,41,59,13,10,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46, - 115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,48,44,32,45,48,46,50,44,32,45,49,46,48,44,32,45,48,46,52,41,59,32,32,47,47, - 32,104,101,105,103,104,116,32,111,102,32,116,104,101,32,102,111,110,116,32,116,101,120,116,32,98,111,120,32,109,117,115,116,32,98,101,13,10,32,32, + 32,32,32,32,32,32,32,32,32,47,47,32,97,116,32,108,101,97,115,116,32,49,53,48,32,112,105,120,101,108,115,32,119,105,100,101,44,32,112,114, + 101,102,101,114,97,98,108,121,32,53,48,37,32,111,102,32,116,104,101,32,116,111,116,97,108,32,119,105,100,116,104,13,10,13,10,32,32,32,32,32, + 32,32,32,118,101,114,116,105,99,97,108,68,105,118,105,100,101,114,66,97,114,32,61,32,110,101,119,32,83,116,114,101,116,99,104,97,98,108,101,76, + 97,121,111,117,116,82,101,115,105,122,101,114,66,97,114,32,40,38,118,101,114,116,105,99,97,108,76,97,121,111,117,116,44,32,49,44,32,116,114,117, + 101,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,101,86,105,115,105,98,108,101,32,40,118,101,114,116,105,99,97,108, + 68,105,118,105,100,101,114,66,97,114,41,59,13,10,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116, + 46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,48,44,32,45,48,46,50,44,32,45,49,46,48,44,32,45,48,46,52,41,59,32,32,47, + 47,32,104,101,105,103,104,116,32,111,102,32,116,104,101,32,102,111,110,116,32,116,101,120,116,32,98,111,120,32,109,117,115,116,32,98,101,13,10,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,47,47,32,98,101,116,119,101,101,110,32,50,48,37,32,97,110,100,32, - 49,48,48,37,44,32,112,114,101,102,101,114,97,98,108,121,32,52,48,37,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108, - 76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,49,44,32,56,44,32,56,44,32,56,41,59,32,32,32,32,32,32, - 32,32,32,32,32,47,47,32,116,104,101,32,104,111,114,105,122,111,110,116,97,108,32,100,105,118,105,100,101,114,32,100,114,97,103,45,98,97,114,32, - 116,104,105,110,103,32,105,115,32,97,108,119,97,121,115,32,56,32,112,105,120,101,108,115,32,104,105,103,104,13,10,32,32,32,32,32,32,32,32,104, - 111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,50,44,32,50,44,32,53,44,32, - 53,41,59,32,32,32,32,32,32,32,32,32,32,32,47,47,32,97,32,103,97,112,32,98,101,116,119,101,101,110,32,116,104,101,32,99,111,110,116,114, - 111,108,115,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121, - 111,117,116,32,40,51,44,32,49,53,44,32,50,48,44,32,50,48,41,59,32,32,32,32,32,32,32,32,47,47,32,116,104,101,32,105,116,97,108,105, - 99,32,98,117,116,116,111,110,32,119,111,117,108,100,32,108,105,107,101,32,116,111,32,98,101,32,50,48,32,112,105,120,101,108,115,32,104,105,103,104, - 13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116, - 32,40,52,44,32,50,44,32,53,44,32,53,41,59,32,32,32,32,32,32,32,32,32,32,32,47,47,32,97,32,103,97,112,32,98,101,116,119,101,101, - 110,32,116,104,101,32,99,111,110,116,114,111,108,115,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116, - 46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,53,44,32,49,53,44,32,50,48,44,32,50,48,41,59,32,32,32,32,32,32,32,32,47, - 47,32,116,104,101,32,98,111,108,100,32,98,117,116,116,111,110,32,119,111,117,108,100,32,108,105,107,101,32,116,111,32,98,101,32,50,48,32,112,105, - 120,101,108,115,32,104,105,103,104,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73, - 116,101,109,76,97,121,111,117,116,32,40,54,44,32,50,44,32,53,44,32,53,41,59,32,32,32,32,32,32,32,32,32,32,32,47,47,32,97,32,103, - 97,112,32,98,101,116,119,101,101,110,32,116,104,101,32,99,111,110,116,114,111,108,115,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110, - 116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,55,44,32,49,53,44,32,50,48,44,32,50,48,41,59, - 32,32,32,32,32,32,32,32,47,47,32,116,104,101,32,105,116,97,108,105,99,32,98,117,116,116,111,110,32,119,111,117,108,100,32,108,105,107,101,32, - 116,111,32,98,101,32,50,48,32,112,105,120,101,108,115,32,104,105,103,104,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108, - 76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,56,44,32,50,44,32,53,44,32,53,41,59,32,32,32,32,32,32, - 32,32,32,32,32,47,47,32,97,32,103,97,112,32,98,101,116,119,101,101,110,32,116,104,101,32,99,111,110,116,114,111,108,115,13,10,32,32,32,32, - 32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,57,44,32,49, - 53,44,32,50,48,44,32,50,48,41,59,32,32,32,32,32,32,32,32,47,47,32,116,104,101,32,99,111,112,121,32,99,111,100,101,32,98,117,116,116, - 111,110,32,119,111,117,108,100,32,108,105,107,101,32,116,111,32,98,101,32,50,48,32,112,105,120,101,108,115,32,104,105,103,104,13,10,32,32,32,32, - 32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,49,48,44,32, - 53,44,32,45,49,46,48,44,32,53,41,59,32,32,32,32,32,32,32,32,47,47,32,97,100,100,32,97,32,103,97,112,32,97,116,32,116,104,101,32, - 98,111,116,116,111,109,32,116,104,97,116,32,119,105,108,108,32,102,105,108,108,32,117,112,32,97,110,121,13,10,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,47,47,32,98,101,116,119,101,101,110,32,50,48,37,32,97,110,100, + 32,49,48,48,37,44,32,112,114,101,102,101,114,97,98,108,121,32,52,48,37,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97, + 108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,49,44,32,56,44,32,56,44,32,56,41,59,32,32,32,32,32, + 32,32,32,32,32,32,47,47,32,116,104,101,32,104,111,114,105,122,111,110,116,97,108,32,100,105,118,105,100,101,114,32,100,114,97,103,45,98,97,114, + 32,116,104,105,110,103,32,105,115,32,97,108,119,97,121,115,32,56,32,112,105,120,101,108,115,32,104,105,103,104,13,10,32,32,32,32,32,32,32,32, + 104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,50,44,32,50,44,32,53,44, + 32,53,41,59,32,32,32,32,32,32,32,32,32,32,32,47,47,32,97,32,103,97,112,32,98,101,116,119,101,101,110,32,116,104,101,32,99,111,110,116, + 114,111,108,115,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97, + 121,111,117,116,32,40,51,44,32,49,53,44,32,50,48,44,32,50,48,41,59,32,32,32,32,32,32,32,32,47,47,32,116,104,101,32,105,116,97,108, + 105,99,32,98,117,116,116,111,110,32,119,111,117,108,100,32,108,105,107,101,32,116,111,32,98,101,32,50,48,32,112,105,120,101,108,115,32,104,105,103, + 104,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117, + 116,32,40,52,44,32,50,44,32,53,44,32,53,41,59,32,32,32,32,32,32,32,32,32,32,32,47,47,32,97,32,103,97,112,32,98,101,116,119,101, + 101,110,32,116,104,101,32,99,111,110,116,114,111,108,115,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117, + 116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,53,44,32,49,53,44,32,50,48,44,32,50,48,41,59,32,32,32,32,32,32,32,32, + 47,47,32,116,104,101,32,98,111,108,100,32,98,117,116,116,111,110,32,119,111,117,108,100,32,108,105,107,101,32,116,111,32,98,101,32,50,48,32,112, + 105,120,101,108,115,32,104,105,103,104,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116, + 73,116,101,109,76,97,121,111,117,116,32,40,54,44,32,50,44,32,53,44,32,53,41,59,32,32,32,32,32,32,32,32,32,32,32,47,47,32,97,32, + 103,97,112,32,98,101,116,119,101,101,110,32,116,104,101,32,99,111,110,116,114,111,108,115,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111, + 110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,55,44,32,49,53,44,32,50,48,44,32,50,48,41, + 59,32,32,32,32,32,32,32,32,47,47,32,116,104,101,32,105,116,97,108,105,99,32,98,117,116,116,111,110,32,119,111,117,108,100,32,108,105,107,101, + 32,116,111,32,98,101,32,50,48,32,112,105,120,101,108,115,32,104,105,103,104,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97, + 108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,56,44,32,50,44,32,53,44,32,53,41,59,32,32,32,32,32, + 32,32,32,32,32,32,47,47,32,97,32,103,97,112,32,98,101,116,119,101,101,110,32,116,104,101,32,99,111,110,116,114,111,108,115,13,10,32,32,32, + 32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,57,44,32, + 49,53,44,32,50,48,44,32,50,48,41,59,32,32,32,32,32,32,32,32,47,47,32,116,104,101,32,99,111,112,121,32,99,111,100,101,32,98,117,116, + 116,111,110,32,119,111,117,108,100,32,108,105,107,101,32,116,111,32,98,101,32,50,48,32,112,105,120,101,108,115,32,104,105,103,104,13,10,32,32,32, + 32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,76,97,121,111,117,116,46,115,101,116,73,116,101,109,76,97,121,111,117,116,32,40,49,48,44, + 32,53,44,32,45,49,46,48,44,32,53,41,59,32,32,32,32,32,32,32,32,47,47,32,97,100,100,32,97,32,103,97,112,32,97,116,32,116,104,101, + 32,98,111,116,116,111,109,32,116,104,97,116,32,119,105,108,108,32,102,105,108,108,32,117,112,32,97,110,121,13,10,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,47,47,32,115,112,97,99,101,32,108,101,102,116,32,111,118,101,114,32,45,32,116,104,105,115,32,119, - 105,108,108,32,115,116,111,112,32,116,104,101,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,47,47,32, - 115,108,105,100,101,114,115,32,102,114,111,109,32,97,108,119,97,121,115,32,115,116,105,99,107,105,110,103,32,116,111,32,116,104,101,13,10,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,47,47,32,115,112,97,99,101,32,108,101,102,116,32,111,118,101,114,32,45,32,116,104,105,115,32, + 119,105,108,108,32,115,116,111,112,32,116,104,101,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,47,47, + 32,115,108,105,100,101,114,115,32,102,114,111,109,32,97,108,119,97,121,115,32,115,116,105,99,107,105,110,103,32,116,111,32,116,104,101,13,10,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,47,47,32,98,111,116,116,111,109,32,111,102,32,116,104,101,32,119,105,110, - 100,111,119,13,10,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,68,105,118,105,100,101,114,66,97,114,32,61,32,110,101, - 119,32,83,116,114,101,116,99,104,97,98,108,101,76,97,121,111,117,116,82,101,115,105,122,101,114,66,97,114,32,40,38,104,111,114,105,122,111,110,116, - 97,108,76,97,121,111,117,116,44,32,49,44,32,102,97,108,115,101,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,101, - 86,105,115,105,98,108,101,32,40,104,111,114,105,122,111,110,116,97,108,68,105,118,105,100,101,114,66,97,114,41,59,13,10,32,32,32,32,125,13,10, - 13,10,32,32,32,32,126,70,111,110,116,115,65,110,100,84,101,120,116,68,101,109,111,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32, - 32,32,100,101,108,101,116,101,65,108,108,67,104,105,108,100,114,101,110,40,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105, - 100,32,114,101,115,105,122,101,100,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,47,47,32,108,97,121,32,111,117,116,32,116, - 104,101,32,108,105,115,116,32,98,111,120,32,97,110,100,32,118,101,114,116,105,99,97,108,32,100,105,118,105,100,101,114,46,46,13,10,32,32,32,32, - 32,32,32,32,67,111,109,112,111,110,101,110,116,42,32,118,99,111,109,112,115,91,93,32,61,32,123,32,108,105,115,116,66,111,120,44,32,118,101,114, - 116,105,99,97,108,68,105,118,105,100,101,114,66,97,114,44,32,48,32,125,59,13,10,13,10,32,32,32,32,32,32,32,32,118,101,114,116,105,99,97, - 108,76,97,121,111,117,116,46,108,97,121,79,117,116,67,111,109,112,111,110,101,110,116,115,32,40,118,99,111,109,112,115,44,32,51,44,13,10,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,52, - 44,32,52,44,32,103,101,116,87,105,100,116,104,40,41,32,45,32,56,44,32,103,101,116,72,101,105,103,104,116,40,41,32,45,32,56,44,13,10,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,47,47,32,98,111,116,116,111,109,32,111,102,32,116,104,101,32,119,105, + 110,100,111,119,13,10,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108,68,105,118,105,100,101,114,66,97,114,32,61,32,110, + 101,119,32,83,116,114,101,116,99,104,97,98,108,101,76,97,121,111,117,116,82,101,115,105,122,101,114,66,97,114,32,40,38,104,111,114,105,122,111,110, + 116,97,108,76,97,121,111,117,116,44,32,49,44,32,102,97,108,115,101,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107, + 101,86,105,115,105,98,108,101,32,40,104,111,114,105,122,111,110,116,97,108,68,105,118,105,100,101,114,66,97,114,41,59,13,10,32,32,32,32,125,13, + 10,13,10,32,32,32,32,126,70,111,110,116,115,65,110,100,84,101,120,116,68,101,109,111,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32, + 32,32,32,100,101,108,101,116,101,65,108,108,67,104,105,108,100,114,101,110,40,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111, + 105,100,32,114,101,115,105,122,101,100,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,47,47,32,108,97,121,32,111,117,116,32, + 116,104,101,32,108,105,115,116,32,98,111,120,32,97,110,100,32,118,101,114,116,105,99,97,108,32,100,105,118,105,100,101,114,46,46,13,10,32,32,32, + 32,32,32,32,32,67,111,109,112,111,110,101,110,116,42,32,118,99,111,109,112,115,91,93,32,61,32,123,32,108,105,115,116,66,111,120,44,32,118,101, + 114,116,105,99,97,108,68,105,118,105,100,101,114,66,97,114,44,32,48,32,125,59,13,10,13,10,32,32,32,32,32,32,32,32,118,101,114,116,105,99, + 97,108,76,97,121,111,117,116,46,108,97,121,79,117,116,67,111,109,112,111,110,101,110,116,115,32,40,118,99,111,109,112,115,44,32,51,44,13,10,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 102,97,108,115,101,44,32,32,32,32,32,47,47,32,108,97,121,32,111,117,116,32,115,105,100,101,45,98,121,45,115,105,100,101,13,10,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,116,114,117, - 101,41,59,32,32,32,32,32,47,47,32,114,101,115,105,122,101,32,116,104,101,32,99,111,109,112,111,110,101,110,116,115,39,32,104,101,105,103,104,116, - 115,32,97,115,32,119,101,108,108,32,97,115,32,119,105,100,116,104,115,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,110,111,119,32,108,97, - 121,32,111,117,116,32,116,104,101,32,116,101,120,116,32,98,111,120,32,97,110,100,32,116,104,101,32,99,111,110,116,114,111,108,115,32,98,101,108,111, - 119,32,105,116,46,46,13,10,32,32,32,32,32,32,32,32,67,111,109,112,111,110,101,110,116,42,32,104,99,111,109,112,115,91,93,32,61,32,123,32, - 116,101,120,116,66,111,120,44,32,104,111,114,105,122,111,110,116,97,108,68,105,118,105,100,101,114,66,97,114,44,32,48,44,13,10,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,98,111,108,100,66,117,116,116,111,110,44,32,48, - 44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,105,116,97,108,105, - 99,66,117,116,116,111,110,44,32,48,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,115,105,122,101,83,108,105,100,101,114,32,125,59,13,10,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97,108, - 76,97,121,111,117,116,46,108,97,121,79,117,116,67,111,109,112,111,110,101,110,116,115,32,40,104,99,111,109,112,115,44,32,56,44,13,10,32,32,32, + 52,44,32,52,44,32,103,101,116,87,105,100,116,104,40,41,32,45,32,56,44,32,103,101,116,72,101,105,103,104,116,40,41,32,45,32,56,44,13,10, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 52,32,43,32,118,101,114,116,105,99,97,108,76,97,121,111,117,116,46,103,101,116,73,116,101,109,67,117,114,114,101,110,116,80,111,115,105,116,105,111, - 110,32,40,50,41,44,32,47,47,32,102,111,114,32,116,104,101,105,114,32,119,105,100,116,104,115,44,32,114,101,102,101,114,32,116,111,32,116,104,101, - 32,118,101,114,116,105,99,97,108,32,108,97,121,111,117,116,32,115,116,97,116,101,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,52,44,13,10,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,118,101,114,116,105,99, - 97,108,76,97,121,111,117,116,46,103,101,116,73,116,101,109,67,117,114,114,101,110,116,65,98,115,111,108,117,116,101,83,105,122,101,32,40,50,41,44, - 13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,103,101,116,72,101,105,103,104,116,40,41,32,45,32,56,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,116,114,117,101,44,32,32,32,32,47,47,32,108,97, - 121,32,111,117,116,32,97,98,111,118,101,32,101,97,99,104,32,111,116,104,101,114,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,116,114,117,101,41,59,32,32,32,47,47,32,114, - 101,115,105,122,101,32,116,104,101,32,99,111,109,112,111,110,101,110,116,115,39,32,119,105,100,116,104,115,32,97,115,32,119,101,108,108,32,97,115,32, - 104,101,105,103,104,116,115,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,47,47,32,105,109,112,108,101,109,101,110,116,115,32,116,104,101,32, - 76,105,115,116,66,111,120,77,111,100,101,108,32,109,101,116,104,111,100,13,10,32,32,32,32,105,110,116,32,103,101,116,78,117,109,82,111,119,115,40, - 41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,114,101,116,117,114,110,32,102,111,110,116,115,46,115,105,122,101,40,41,59,13,10, - 32,32,32,32,125,13,10,13,10,32,32,32,32,47,47,32,105,109,112,108,101,109,101,110,116,115,32,116,104,101,32,76,105,115,116,66,111,120,77,111, - 100,101,108,32,109,101,116,104,111,100,13,10,32,32,32,32,118,111,105,100,32,112,97,105,110,116,76,105,115,116,66,111,120,73,116,101,109,32,40,105, - 110,116,32,114,111,119,78,117,109,98,101,114,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,71,114,97,112,104,105,99,115,38,32,103,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,105,110,116,32,119,105,100,116,104,44,32,105,110,116,32,104,101,105,103,104,116,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,32,32,32,98,111,111,108,32,114,111,119,73,115,83,101,108,101,99,116,101,100,41,13,10,32,32,32,32,123, - 13,10,32,32,32,32,32,32,32,32,105,102,32,40,114,111,119,73,115,83,101,108,101,99,116,101,100,41,13,10,32,32,32,32,32,32,32,32,32,32, - 32,32,103,46,102,105,108,108,65,108,108,32,40,67,111,108,111,117,114,115,58,58,108,105,103,104,116,98,108,117,101,41,59,13,10,13,10,32,32,32, - 32,32,32,32,32,105,102,32,40,102,111,110,116,115,32,91,114,111,119,78,117,109,98,101,114,93,32,33,61,32,48,41,13,10,32,32,32,32,32,32, - 32,32,123,13,10,32,32,32,32,32,32,32,32,32,32,32,32,70,111,110,116,32,102,111,110,116,32,40,42,102,111,110,116,115,32,91,114,111,119,78, - 117,109,98,101,114,93,41,59,13,10,32,32,32,32,32,32,32,32,32,32,32,32,102,111,110,116,46,115,101,116,72,101,105,103,104,116,32,40,104,101, - 105,103,104,116,32,42,32,48,46,55,102,41,59,13,10,13,10,32,32,32,32,32,32,32,32,32,32,32,32,103,46,115,101,116,70,111,110,116,32,40, - 102,111,110,116,41,59,13,10,32,32,32,32,32,32,32,32,32,32,32,32,103,46,100,114,97,119,84,101,120,116,32,40,102,111,110,116,46,103,101,116, - 84,121,112,101,102,97,99,101,78,97,109,101,40,41,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,52,44,32,48,44,32,119,105,100,116,104,32,45,32,52,44,32,104,101,105,103,104,116,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32, - 32,32,32,32,32,32,32,32,32,32,32,74,117,115,116,105,102,105,99,97,116,105,111,110,58,58,99,101,110,116,114,101,100,76,101,102,116,44,32,116, - 114,117,101,41,59,13,10,32,32,32,32,32,32,32,32,125,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,117,112,100,97, - 116,101,80,114,101,118,105,101,119,66,111,120,84,101,120,116,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,70,111,110,116,42, - 32,102,32,61,32,102,111,110,116,115,32,91,108,105,115,116,66,111,120,45,62,103,101,116,83,101,108,101,99,116,101,100,82,111,119,40,41,93,59,13, - 10,13,10,32,32,32,32,32,32,32,32,105,102,32,40,102,32,33,61,32,48,41,13,10,32,32,32,32,32,32,32,32,123,13,10,32,32,32,32,32, - 32,32,32,32,32,32,32,70,111,110,116,32,102,111,110,116,32,40,42,102,41,59,13,10,13,10,32,32,32,32,32,32,32,32,32,32,32,32,102,111, - 110,116,46,115,101,116,72,101,105,103,104,116,32,40,40,102,108,111,97,116,41,32,115,105,122,101,83,108,105,100,101,114,45,62,103,101,116,86,97,108, - 117,101,40,41,41,59,13,10,32,32,32,32,32,32,32,32,32,32,32,32,102,111,110,116,46,115,101,116,66,111,108,100,32,40,98,111,108,100,66,117, - 116,116,111,110,45,62,103,101,116,84,111,103,103,108,101,83,116,97,116,101,40,41,41,59,13,10,32,32,32,32,32,32,32,32,32,32,32,32,102,111, - 110,116,46,115,101,116,73,116,97,108,105,99,32,40,105,116,97,108,105,99,66,117,116,116,111,110,45,62,103,101,116,84,111,103,103,108,101,83,116,97, - 116,101,40,41,41,59,13,10,13,10,32,32,32,32,32,32,32,32,32,32,32,32,116,101,120,116,66,111,120,45,62,97,112,112,108,121,70,111,110,116, - 84,111,65,108,108,84,101,120,116,32,40,102,111,110,116,41,59,13,10,32,32,32,32,32,32,32,32,125,13,10,32,32,32,32,125,13,10,13,10,32, - 32,32,32,118,111,105,100,32,115,101,108,101,99,116,101,100,82,111,119,115,67,104,97,110,103,101,100,32,40,105,110,116,32,108,97,115,116,82,111,119, - 115,101,108,101,99,116,101,100,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,117,112,100,97,116,101,80,114,101,118,105,101,119,66, - 111,120,84,101,120,116,40,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,98,117,116,116,111,110,67,108,105,99,107, - 101,100,32,40,66,117,116,116,111,110,42,32,98,117,116,116,111,110,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,117,112,100,97, - 116,101,80,114,101,118,105,101,119,66,111,120,84,101,120,116,40,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,115, - 108,105,100,101,114,86,97,108,117,101,67,104,97,110,103,101,100,32,40,83,108,105,100,101,114,42,41,13,10,32,32,32,32,123,13,10,32,32,32,32, - 32,32,32,32,47,47,32,40,116,104,105,115,32,105,115,32,99,97,108,108,101,100,32,119,104,101,110,32,116,104,101,32,115,105,122,101,32,115,108,105, - 100,101,114,32,105,115,32,109,111,118,101,100,41,13,10,32,32,32,32,32,32,32,32,117,112,100,97,116,101,80,114,101,118,105,101,119,66,111,120,84, - 101,120,116,40,41,59,13,10,32,32,32,32,125,13,10,125,59,13,10,13,10,13,10,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61, + 32,102,97,108,115,101,44,32,32,32,32,32,47,47,32,108,97,121,32,111,117,116,32,115,105,100,101,45,98,121,45,115,105,100,101,13,10,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,116,114, + 117,101,41,59,32,32,32,32,32,47,47,32,114,101,115,105,122,101,32,116,104,101,32,99,111,109,112,111,110,101,110,116,115,39,32,104,101,105,103,104, + 116,115,32,97,115,32,119,101,108,108,32,97,115,32,119,105,100,116,104,115,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,110,111,119,32,108, + 97,121,32,111,117,116,32,116,104,101,32,116,101,120,116,32,98,111,120,32,97,110,100,32,116,104,101,32,99,111,110,116,114,111,108,115,32,98,101,108, + 111,119,32,105,116,46,46,13,10,32,32,32,32,32,32,32,32,67,111,109,112,111,110,101,110,116,42,32,104,99,111,109,112,115,91,93,32,61,32,123, + 32,116,101,120,116,66,111,120,44,32,104,111,114,105,122,111,110,116,97,108,68,105,118,105,100,101,114,66,97,114,44,32,48,44,13,10,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,98,111,108,100,66,117,116,116,111,110,44,32, + 48,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,105,116,97,108, + 105,99,66,117,116,116,111,110,44,32,48,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,115,105,122,101,83,108,105,100,101,114,32,125,59,13,10,13,10,32,32,32,32,32,32,32,32,104,111,114,105,122,111,110,116,97, + 108,76,97,121,111,117,116,46,108,97,121,79,117,116,67,111,109,112,111,110,101,110,116,115,32,40,104,99,111,109,112,115,44,32,56,44,13,10,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,52,32,43,32,118,101,114,116,105,99,97,108,76,97,121,111,117,116,46,103,101,116,73,116,101,109,67,117,114,114,101,110,116,80,111,115,105,116,105, + 111,110,32,40,50,41,44,32,47,47,32,102,111,114,32,116,104,101,105,114,32,119,105,100,116,104,115,44,32,114,101,102,101,114,32,116,111,32,116,104, + 101,32,118,101,114,116,105,99,97,108,32,108,97,121,111,117,116,32,115,116,97,116,101,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,52,44,13,10,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,118,101,114,116,105, + 99,97,108,76,97,121,111,117,116,46,103,101,116,73,116,101,109,67,117,114,114,101,110,116,65,98,115,111,108,117,116,101,83,105,122,101,32,40,50,41, + 44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,103,101,116,72,101,105,103,104,116,40,41,32,45,32,56,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,116,114,117,101,44,32,32,32,32,47,47,32,108, + 97,121,32,111,117,116,32,97,98,111,118,101,32,101,97,99,104,32,111,116,104,101,114,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,116,114,117,101,41,59,32,32,32,47,47,32, + 114,101,115,105,122,101,32,116,104,101,32,99,111,109,112,111,110,101,110,116,115,39,32,119,105,100,116,104,115,32,97,115,32,119,101,108,108,32,97,115, + 32,104,101,105,103,104,116,115,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,47,47,32,105,109,112,108,101,109,101,110,116,115,32,116,104,101, + 32,76,105,115,116,66,111,120,77,111,100,101,108,32,109,101,116,104,111,100,13,10,32,32,32,32,105,110,116,32,103,101,116,78,117,109,82,111,119,115, + 40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,114,101,116,117,114,110,32,102,111,110,116,115,46,115,105,122,101,40,41,59,13, + 10,32,32,32,32,125,13,10,13,10,32,32,32,32,47,47,32,105,109,112,108,101,109,101,110,116,115,32,116,104,101,32,76,105,115,116,66,111,120,77, + 111,100,101,108,32,109,101,116,104,111,100,13,10,32,32,32,32,118,111,105,100,32,112,97,105,110,116,76,105,115,116,66,111,120,73,116,101,109,32,40, + 105,110,116,32,114,111,119,78,117,109,98,101,114,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,71,114,97,112,104,105,99,115,38,32,103,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,105,110,116,32,119,105,100,116,104,44,32,105,110,116,32,104,101,105,103,104,116,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,98,111,111,108,32,114,111,119,73,115,83,101,108,101,99,116,101,100,41,13,10,32,32,32,32, + 123,13,10,32,32,32,32,32,32,32,32,105,102,32,40,114,111,119,73,115,83,101,108,101,99,116,101,100,41,13,10,32,32,32,32,32,32,32,32,32, + 32,32,32,103,46,102,105,108,108,65,108,108,32,40,67,111,108,111,117,114,115,58,58,108,105,103,104,116,98,108,117,101,41,59,13,10,13,10,32,32, + 32,32,32,32,32,32,105,102,32,40,102,111,110,116,115,32,91,114,111,119,78,117,109,98,101,114,93,32,33,61,32,48,41,13,10,32,32,32,32,32, + 32,32,32,123,13,10,32,32,32,32,32,32,32,32,32,32,32,32,70,111,110,116,32,102,111,110,116,32,40,42,102,111,110,116,115,32,91,114,111,119, + 78,117,109,98,101,114,93,41,59,13,10,32,32,32,32,32,32,32,32,32,32,32,32,102,111,110,116,46,115,101,116,72,101,105,103,104,116,32,40,104, + 101,105,103,104,116,32,42,32,48,46,55,102,41,59,13,10,13,10,32,32,32,32,32,32,32,32,32,32,32,32,103,46,115,101,116,70,111,110,116,32, + 40,102,111,110,116,41,59,13,10,32,32,32,32,32,32,32,32,32,32,32,32,103,46,100,114,97,119,84,101,120,116,32,40,102,111,110,116,46,103,101, + 116,84,121,112,101,102,97,99,101,78,97,109,101,40,41,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,52,44,32,48,44,32,119,105,100,116,104,32,45,32,52,44,32,104,101,105,103,104,116,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32, + 32,32,32,32,32,32,32,32,32,32,32,32,74,117,115,116,105,102,105,99,97,116,105,111,110,58,58,99,101,110,116,114,101,100,76,101,102,116,44,32, + 116,114,117,101,41,59,13,10,32,32,32,32,32,32,32,32,125,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,117,112,100, + 97,116,101,80,114,101,118,105,101,119,66,111,120,84,101,120,116,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,70,111,110,116, + 42,32,102,32,61,32,102,111,110,116,115,32,91,108,105,115,116,66,111,120,45,62,103,101,116,83,101,108,101,99,116,101,100,82,111,119,40,41,93,59, + 13,10,13,10,32,32,32,32,32,32,32,32,105,102,32,40,102,32,33,61,32,48,41,13,10,32,32,32,32,32,32,32,32,123,13,10,32,32,32,32, + 32,32,32,32,32,32,32,32,70,111,110,116,32,102,111,110,116,32,40,42,102,41,59,13,10,13,10,32,32,32,32,32,32,32,32,32,32,32,32,102, + 111,110,116,46,115,101,116,72,101,105,103,104,116,32,40,40,102,108,111,97,116,41,32,115,105,122,101,83,108,105,100,101,114,45,62,103,101,116,86,97, + 108,117,101,40,41,41,59,13,10,32,32,32,32,32,32,32,32,32,32,32,32,102,111,110,116,46,115,101,116,66,111,108,100,32,40,98,111,108,100,66, + 117,116,116,111,110,45,62,103,101,116,84,111,103,103,108,101,83,116,97,116,101,40,41,41,59,13,10,32,32,32,32,32,32,32,32,32,32,32,32,102, + 111,110,116,46,115,101,116,73,116,97,108,105,99,32,40,105,116,97,108,105,99,66,117,116,116,111,110,45,62,103,101,116,84,111,103,103,108,101,83,116, + 97,116,101,40,41,41,59,13,10,13,10,32,32,32,32,32,32,32,32,32,32,32,32,116,101,120,116,66,111,120,45,62,97,112,112,108,121,70,111,110, + 116,84,111,65,108,108,84,101,120,116,32,40,102,111,110,116,41,59,13,10,32,32,32,32,32,32,32,32,125,13,10,32,32,32,32,125,13,10,13,10, + 32,32,32,32,118,111,105,100,32,115,101,108,101,99,116,101,100,82,111,119,115,67,104,97,110,103,101,100,32,40,105,110,116,32,108,97,115,116,82,111, + 119,115,101,108,101,99,116,101,100,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,117,112,100,97,116,101,80,114,101,118,105,101,119, + 66,111,120,84,101,120,116,40,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,98,117,116,116,111,110,67,108,105,99, + 107,101,100,32,40,66,117,116,116,111,110,42,32,98,117,116,116,111,110,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,117,112,100, + 97,116,101,80,114,101,118,105,101,119,66,111,120,84,101,120,116,40,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32, + 115,108,105,100,101,114,86,97,108,117,101,67,104,97,110,103,101,100,32,40,83,108,105,100,101,114,42,41,13,10,32,32,32,32,123,13,10,32,32,32, + 32,32,32,32,32,47,47,32,40,116,104,105,115,32,105,115,32,99,97,108,108,101,100,32,119,104,101,110,32,116,104,101,32,115,105,122,101,32,115,108, + 105,100,101,114,32,105,115,32,109,111,118,101,100,41,13,10,32,32,32,32,32,32,32,32,117,112,100,97,116,101,80,114,101,118,105,101,119,66,111,120, + 84,101,120,116,40,41,59,13,10,32,32,32,32,125,13,10,125,59,13,10,13,10,13,10,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61, 61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61, - 61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,67,111,109,112,111,110,101,110,116,42,32,99,114,101,97, - 116,101,70,111,110,116,115,65,110,100,84,101,120,116,68,101,109,111,40,41,13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,32, - 70,111,110,116,115,65,110,100,84,101,120,116,68,101,109,111,40,41,59,13,10,125,13,10,0,0}; + 61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,67,111,109,112,111,110,101,110,116,42,32,99,114,101, + 97,116,101,70,111,110,116,115,65,110,100,84,101,120,116,68,101,109,111,40,41,13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119, + 32,70,111,110,116,115,65,110,100,84,101,120,116,68,101,109,111,40,41,59,13,10,125,13,10,0,0}; const char* BinaryData::fontsandtextdemo_cpp = (const char*) temp5; static const unsigned char temp6[] = {80,75,3,4,20,0,2,0,8,0,128,122,250,52,23,17,234,255,206,13,0,0,219,67,0,0,16,0,0,0,100,111,99,117,109,101,110,116,45,110, diff --git a/extras/juce demo/src/BinaryData.h b/extras/juce demo/src/BinaryData.h index a2bf497466..4e4cb94873 100644 --- a/extras/juce demo/src/BinaryData.h +++ b/extras/juce demo/src/BinaryData.h @@ -18,7 +18,7 @@ namespace BinaryData const int draganddropdemo_cppSize = 7874; extern const char* fontsandtextdemo_cpp; - const int fontsandtextdemo_cppSize = 9064; + const int fontsandtextdemo_cppSize = 9065; extern const char* icons_zip; const int icons_zipSize = 83876; diff --git a/extras/juce demo/src/binarydata/FontsAndTextDemo.cpp b/extras/juce demo/src/binarydata/FontsAndTextDemo.cpp index 7de327ce42..f5281fd2b0 100644 --- a/extras/juce demo/src/binarydata/FontsAndTextDemo.cpp +++ b/extras/juce demo/src/binarydata/FontsAndTextDemo.cpp @@ -78,7 +78,7 @@ public: italicButton->addButtonListener (this); addAndMakeVisible (sizeSlider = new Slider (T("size"))); - sizeSlider->setRange (3.0, 50.0, 0.1); + sizeSlider->setRange (3.0, 150.0, 0.1); sizeSlider->setValue (20.0); sizeSlider->addListener (this); diff --git a/src/juce_core/threads/juce_ThreadPool.cpp b/src/juce_core/threads/juce_ThreadPool.cpp index 77ce25130b..a08b3af4b2 100644 --- a/src/juce_core/threads/juce_ThreadPool.cpp +++ b/src/juce_core/threads/juce_ThreadPool.cpp @@ -43,7 +43,8 @@ ThreadPoolJob::ThreadPoolJob (const String& name) : jobName (name), pool (0), shouldStop (false), - isActive (false) + isActive (false), + shouldBeDeleted (false) { } @@ -360,6 +361,9 @@ bool ThreadPool::runNextJob() job->pool = 0; job->shouldStop = true; jobs.removeValue (job); + + if (result == ThreadPoolJob::jobHasFinishedAndShouldBeDeleted) + delete job; } else { diff --git a/src/juce_core/threads/juce_ThreadPool.h b/src/juce_core/threads/juce_ThreadPool.h index dd330603bb..d4110fcf2d 100644 --- a/src/juce_core/threads/juce_ThreadPool.h +++ b/src/juce_core/threads/juce_ThreadPool.h @@ -85,6 +85,10 @@ public: { jobHasFinished = 0, /**< indicates that the job has finished and can be removed from the pool. */ + + jobHasFinishedAndShouldBeDeleted, /**< indicates that the job has finished and that it + should be automatically deleted by the pool. */ + jobNeedsRunningAgain /**< indicates that the job would like to be called again when a thread is free. */ }; @@ -126,7 +130,6 @@ public: */ void signalJobShouldExit(); - //============================================================================== juce_UseDebuggingNewOperator @@ -135,7 +138,7 @@ private: friend class ThreadPoolThread; String jobName; ThreadPool* pool; - bool shouldStop, isActive; + bool shouldStop, isActive, shouldBeDeleted; };