[xiph-commits] r6943 - in trunk/oggdsf: sln/oggdsf_all

illiminable at dactyl.lonelymoon.com illiminable
Thu Jul 1 13:24:19 PDT 2004


src/lib/codecs/theora/filters/dsfTheoraDecoder
src/lib/codecs/theora/filters/dsfTheoraEncoder
src/lib/codecs/theora/libs/libOOTheora
src/lib/core/directshow/dsfOggDemux
Message-ID: <20040701202419.E46AA9AAAD at dactyl.lonelymoon.com>

Author: illiminable
Date: Thu Jul  1 13:24:19 2004
New Revision: 6943

Added:
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.aps
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.rc
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/resource.h
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/theora_cdecl.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/PropsAbout.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/PropsAbout.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.aps
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.rc
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/resource.h
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraEncoder.h
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/oggdllstuff.h
Log:
* Started adding property pages to filters for encoding parameters.

* Created a new header file for theora, because it insists on __cdecl convention, and directshow insists on __stdcall convention. Ze #ifdef __cplusplus extern "C" 's zey do nussing !
* The same had to be done previously for libfishsound, they are currently scattered about, they need to be moved into those projects later.

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-07-01 20:24:17 UTC (rev 6943)
@@ -83,505 +83,569 @@
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.0 = {A882A968-3013-4A27-B653-E18CF5C791FE}
{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{4906E533-2864-4840-ABC1-00CD844623EB}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{4906E533-2864-4840-ABC1-00CD844623EB}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{4906E533-2864-4840-ABC1-00CD844623EB}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{AE32588D-2807-4796-9E68-C9104817BC1A}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{AE32588D-2807-4796-9E68-C9104817BC1A}.1 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{AE32588D-2807-4796-9E68-C9104817BC1A}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{AE32588D-2807-4796-9E68-C9104817BC1A}.3 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.0 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.2 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.3 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{6B548F29-04A2-4F61-946F-72B86B4845DA}.0 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.0 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.1 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.1 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.3 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.3 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.4 = {A882A968-3013-4A27-B653-E18CF5C791FE}
{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.0 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.1 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.3 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.0 = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.0 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.1 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.2 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.0 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.2 = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{D74A626E-C8CB-4787-913E-2E637FC04F2B}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.1 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.3 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.4 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.3 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.1 = {4906E533-2864-4840-ABC1-00CD844623EB}
{419E0701-9C9A-4671-B3B6-79FA206DEE25}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.3 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.0 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.0 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.1 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.1 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.1 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.3 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.3 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{73D3CA81-3BDC-42F1-8456-76224F6B337C}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.0 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.1 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.2 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.3 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.4 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.5 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.6 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.7 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.8 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.9 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.10 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.11 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.12 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.13 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.14 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.15 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.16 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.17 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.18 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.19 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.20 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.21 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.22 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.23 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.24 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.25 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.26 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.27 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.28 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.29 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.30 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.31 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.32 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.33 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.34 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.35 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.36 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.37 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.38 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.39 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.40 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.41 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.42 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.43 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.44 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.45 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.46 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.47 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.48 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.49 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.50 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.51 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.52 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.53 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.54 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.55 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.56 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.57 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.58 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.59 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.60 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.61 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.62 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.63 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.64 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.65 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.66 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.67 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.68 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.69 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.70 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.71 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.72 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.73 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.74 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.75 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.76 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.77 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.78 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.79 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.80 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.81 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.82 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.83 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.84 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.85 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.86 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.87 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.88 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.89 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.90 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.91 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.92 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.93 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.94 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.95 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.96 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.97 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.98 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.99 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.100 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.101 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.102 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.103 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.104 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.105 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.106 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.107 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.108 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.109 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.110 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.111 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.112 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.113 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.114 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.115 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.116 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.117 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.118 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.119 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.120 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.121 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.122 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.123 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.124 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.125 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.126 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.127 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.128 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.129 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.130 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.131 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.132 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.133 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.134 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.135 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.136 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.137 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.138 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.139 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.140 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.141 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.142 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.143 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.144 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.145 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.146 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.147 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.148 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.149 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.150 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.151 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.152 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.153 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.154 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.155 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.156 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.157 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.158 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.2 = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.3 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.4 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.5 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.6 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.7 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.8 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.9 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.10 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.11 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.12 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.13 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.14 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.15 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.16 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.17 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.18 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.19 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.20 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.21 = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.22 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.23 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.24 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.25 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.26 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.27 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.28 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.29 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.30 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.31 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.32 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.33 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.34 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.35 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.36 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.37 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.38 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.39 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.40 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.41 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.42 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.43 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.44 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.45 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.46 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.47 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.48 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.49 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.50 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.51 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.52 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.53 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.54 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.55 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.56 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.57 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.58 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.59 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.60 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.61 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.62 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.63 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.64 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.65 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.66 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.67 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.68 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.69 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.70 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.71 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.72 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.73 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.74 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.75 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.76 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.77 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.78 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.79 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.80 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.81 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.82 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.83 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.84 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.85 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.86 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.87 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.88 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.89 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.90 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.91 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.92 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.93 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.94 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.95 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.96 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.97 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.98 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.99 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.100 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.101 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.102 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.103 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.104 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.105 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.106 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.107 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.108 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.109 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.110 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.111 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.112 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.113 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.114 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.115 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.116 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.117 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.118 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.119 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.120 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.121 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.122 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.123 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.124 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.125 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.126 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.127 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.128 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.129 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.130 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.131 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.132 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.133 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.134 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.135 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.136 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.137 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.138 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.139 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.140 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.141 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.142 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.143 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.144 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.145 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.146 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.147 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.148 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.149 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.150 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.151 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.152 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.153 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.154 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.155 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.156 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.157 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.158 = {4906E533-2864-4840-ABC1-00CD844623EB}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.159 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.160 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.161 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.162 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.163 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.164 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.165 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.166 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.167 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.168 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.169 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.170 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.171 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.172 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.173 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.174 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.175 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.176 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.177 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.178 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.179 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.180 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.181 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.160 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.161 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.162 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.163 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.164 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.165 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.166 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.167 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.168 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.169 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.170 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.171 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.172 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.173 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.174 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.175 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.176 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.177 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.178 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.179 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.180 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.181 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.182 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.183 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.184 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.185 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.186 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.187 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.188 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.189 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.190 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.191 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.192 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.193 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.194 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.195 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.196 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.197 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.198 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.199 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.200 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.201 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.202 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.203 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.204 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.183 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.184 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.185 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.186 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.187 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.188 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.189 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.190 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.191 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.192 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.193 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.194 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.195 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.196 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.197 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.198 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.199 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.200 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.201 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.202 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.203 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.204 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.205 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.206 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.207 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.208 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.209 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.210 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.211 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.212 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.213 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.214 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.215 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.206 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.207 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.208 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.209 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.210 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.211 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.212 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.213 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.214 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.215 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.216 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.217 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.218 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.219 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.220 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.221 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.222 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.223 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.224 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.225 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.226 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.227 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.228 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.229 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.230 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.231 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.232 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.233 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.234 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.235 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.236 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.237 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.238 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.217 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.218 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.219 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.220 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.221 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.222 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.223 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.224 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.225 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.226 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.227 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.228 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.229 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.230 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.231 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.232 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.233 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.234 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.235 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.236 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.237 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.238 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.239 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.240 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.241 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.242 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.243 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.244 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.245 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.246 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.247 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.248 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.249 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.240 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.241 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.242 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.243 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.244 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.245 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.246 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.247 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.248 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.249 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.250 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.251 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.252 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.253 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.254 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.255 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.256 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.257 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.258 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.259 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.260 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.261 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.262 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.263 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.264 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.265 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.266 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.267 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.268 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.269 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.270 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.271 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.272 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.251 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.252 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.253 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.254 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.255 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.256 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.257 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.258 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.259 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.260 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.261 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.262 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.263 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.264 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.265 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.266 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.267 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.268 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.269 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.270 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.271 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.272 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.273 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.274 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.275 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.276 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.277 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.278 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.279 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.280 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.281 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.282 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.283 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.284 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.285 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.286 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.287 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.288 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.289 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.290 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.291 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.292 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.293 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.294 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.295 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.274 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.275 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.276 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.277 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.278 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.279 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.280 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.281 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.282 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.283 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.284 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.285 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.286 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.287 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.288 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.289 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.290 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.291 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.292 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.293 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.294 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.295 = {4906E533-2864-4840-ABC1-00CD844623EB}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.296 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.297 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.298 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.299 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.300 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.301 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.302 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.303 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.304 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.305 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.306 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.307 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.308 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.309 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.310 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.311 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.312 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.313 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.314 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.315 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.316 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.317 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.318 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.319 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.320 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.321 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.322 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.323 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.324 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.325 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.326 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.327 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.328 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.329 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.330 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.331 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.332 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.333 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.334 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.335 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.336 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.337 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.338 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.339 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.340 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.341 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.342 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.343 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.344 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.345 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.346 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.347 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.348 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.349 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.350 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.351 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.352 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.353 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.354 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.355 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.356 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.357 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.358 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.359 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.360 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.361 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.362 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.363 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.364 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.365 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.366 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.367 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.368 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.369 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.370 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.371 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.372 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.373 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.374 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.375 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.376 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.377 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.378 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.379 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.380 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.381 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.382 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.383 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.384 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.385 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.386 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.387 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.388 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.389 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.390 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.391 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.392 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.393 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.394 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.395 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.396 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.397 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.398 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.399 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.400 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.401 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.402 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.403 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.404 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.405 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.406 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.407 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.408 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.409 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.410 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.411 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.412 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.413 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.414 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.415 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.416 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.417 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.418 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.419 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.420 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.421 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.422 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.423 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.297 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.298 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.299 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.300 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.301 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.302 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.303 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.304 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.305 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.306 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.307 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.308 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.309 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.310 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.311 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.312 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.313 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.314 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.315 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.316 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.317 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.318 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.319 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.320 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.321 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.322 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.323 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.324 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.325 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.326 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.327 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.328 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.329 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.330 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.331 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.332 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.333 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.334 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.335 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.336 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.337 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.338 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.339 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.340 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.341 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.342 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.343 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.344 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.345 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.346 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.347 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.348 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.349 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.350 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.351 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.352 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.353 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.354 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.355 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.356 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.357 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.358 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.359 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.360 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.361 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.362 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.363 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.364 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.365 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.366 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.367 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.368 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.369 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.370 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.371 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.372 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.373 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.374 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.375 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.376 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.377 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.378 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.379 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.380 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.381 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.382 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.383 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.384 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.385 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.386 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.387 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.388 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.389 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.390 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.391 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.392 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.393 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.394 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.395 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.396 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.397 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.398 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.399 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.400 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.401 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.402 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.403 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.404 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.405 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.406 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.407 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.408 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.409 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.410 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.411 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.412 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.413 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.414 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.415 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.416 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.417 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.418 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.419 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.420 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.421 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.422 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.423 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.424 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.425 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.426 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.427 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.428 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.429 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.430 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.431 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.432 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.433 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.434 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.435 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.436 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.437 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.438 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.439 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.440 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.441 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.442 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.443 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.444 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.445 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.446 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.447 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.448 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.449 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.450 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.451 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.452 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.453 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.454 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.455 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.456 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.457 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.458 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.459 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.460 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.461 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.462 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.463 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.464 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.465 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.466 = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.467 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.468 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.469 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.470 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.471 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.472 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.473 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.474 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.475 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.476 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.477 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.478 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.479 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.480 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.481 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.482 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.483 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.484 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.485 = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.486 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.487 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.0 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.0 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{F9F22B14-22FE-4651-81B8-5AE267A6B189}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.3 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.4 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.3 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.4 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.1 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.2 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.2 = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.3 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.4 = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.4 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.0 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{6C1AD4AE-7675-4CD0-AE70-897C628AA219}.0 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{6C1AD4AE-7675-4CD0-AE70-897C628AA219}.1 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.0 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{6C1AD4AE-7675-4CD0-AE70-897C628AA219}.0 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{6C1AD4AE-7675-4CD0-AE70-897C628AA219}.1 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.0 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.2 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.0 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.2 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.1 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Debug.ActiveCfg = Debug|Win32
@@ -955,6 +1019,9 @@
{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release Unicode.ActiveCfg = Release|Win32
{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release Unicode.Build.0 = Release|Win32
EndGlobalSection
+	GlobalSection(SolutionItems) = postSolution
+		Item:1 = ..\..\docs\oggdsf_all.vsd
+	EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp	2004-07-01 20:24:17 UTC (rev 6943)
@@ -91,6 +91,8 @@
return pNewObject;
}

+
+
//QUERY::: Do we need these ? Aren't we all friedns here ??
//RESULT::: Keep them, set function must be kept... get could go... but keep for consistency
sTheoraFormatBlock* TheoraDecodeFilter::getTheoraFormatBlock()

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -50,6 +50,9 @@
friend class TheoraDecodeInputPin;
friend class TheoraDecodeOutputPin;

+
+
+
//Constructors and Destructors
TheoraDecodeFilter(void);
virtual ~TheoraDecodeFilter(void);
@@ -57,6 +60,9 @@
//COM Creator Function
static CUnknown* WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);

+
+
+
//VIRTUAL FUNCTIONS - AbstractAudioDecodeFilter
virtual bool ConstructPins();


Added: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.cpp	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.cpp	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,10 @@
+#include "StdAfx.h"
+#include "itheoraencodesettings.h"
+
+ITheoraEncodeSettings::ITheoraEncodeSettings(void)
+{
+}
+
+ITheoraEncodeSettings::~ITheoraEncodeSettings(void)
+{
+}

Added: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/ITheoraEncodeSettings.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,21 @@
+#pragma once
+
+class ITheoraEncodeSettings
+{
+public:
+
+	virtual unsigned long targetBitrate() = 0;
+	virtual unsigned char quality() = 0;
+	virtual unsigned long keyframeFreq() = 0;
+
+	virtual bool setTargetBitrate(unsigned long inBitrate) = 0;
+	virtual bool setQuality(unsigned char inQuality) = 0;
+	virtual bool setKeyframeFreq(unsigned long inKeyframeFreq) = 0;
+protected:
+	//unsigned long mTargetBitrate;
+
+	//unsigned char mQuality;
+
+	//unsigned long mKeyframeFreq;
+
+};

Added: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.cpp	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,81 @@
+#include "StdAfx.h"
+#include "propstheoraencoder.h"
+
+PropsTheoraEncoder::PropsTheoraEncoder(LPUNKNOWN inUnk, HRESULT* outHR)
+	:	CBasePropertyPage(NAME("illiminable Directshow Filters"), inUnk, IDD_THEORA_ENCODE_SETTINGS, IDS_THEORA_ENC_PROPS_STRING)
+	,	mTheoraEncodeSettings(NULL)
+
+{
+	*outHR = S_OK;
+}
+
+PropsTheoraEncoder::~PropsTheoraEncoder(void)
+{
+}
+
+CUnknown* PropsTheoraEncoder::CreateInstance(LPUNKNOWN inUnk, HRESULT* outHR)
+{
+    return new PropsTheoraEncoder(inUnk, outHR);
+}
+
+HRESULT PropsTheoraEncoder::OnActivate(void)
+{
+
+    char* locStrBuff = new char[16];
+
+    SendDlgItemMessage(m_Dlg, IDC_SLIDER_QUALITY, TBM_SETRANGE, 0, MAKELONG(0, 63));
+    SendDlgItemMessage(m_Dlg, IDC_SLIDER_QUALITY, TBM_SETTICFREQ, 1, 0);
+    SendDlgItemMessage(m_Dlg, IDC_SLIDER_QUALITY, TBM_SETPOS, 1, mTheoraEncodeSettings->quality());
+
+    itoa(mTheoraEncodeSettings->targetBitrate(), locStrBuff, 10);
+
+	SendDlgItemMessage(m_Dlg, IDC_COMBO_BITRATE, WM_SETTEXT, 0, (LPARAM)locStrBuff);
+	itoa(mTheoraEncodeSettings->keyframeFreq(), locStrBuff, 10);
+	SendDlgItemMessage(m_Dlg, IDC_COMBO_KEYFRAME_FREQ, WM_SETTEXT, 0, (LPARAM)locStrBuff);
+
+	delete locStrBuff;
+    return S_OK;
+}
+
+HRESULT PropsTheoraEncoder::OnConnect(IUnknown *pUnk)
+{
+
+	if (mTheoraEncodeSettings != NULL) {
+		//mTheoraEncodeSettings->Release();
+		mTheoraEncodeSettings = NULL;
+	}
+
+    HRESULT locHR;
+    // Query pUnk for the filter's custom interface.
+    locHR = pUnk->QueryInterface(IID_ITheoraEncodeSettings, (void**)(&mTheoraEncodeSettings));
+    return locHR;
+}
+
+HRESULT PropsTheoraEncoder::OnDisconnect(void)
+{
+	if (mTheoraEncodeSettings != NULL) {
+		//mTheoraEncodeSettings->Release();
+		mTheoraEncodeSettings = NULL;
+	}
+    return S_OK;
+}
+
+INT_PTR PropsTheoraEncoder::OnReceiveMessage(HWND hwnd,  UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    switch (uMsg)
+    {
+    case WM_COMMAND:
+        if (LOWORD(wParam) == IDC_SLIDER_QUALITY)
+        {
+            UINT m_lNewVal = GetDlgItemInt(m_Dlg, IDC_SLIDER_QUALITY, 0, TRUE);
+            //SetDirty();
+            return (INT_PTR)TRUE;
+        }
+        break;
+    } // switch
+
+    // Did not handle the message.
+    return CBasePropertyPage::OnReceiveMessage(hwnd, uMsg, wParam, lParam);
+}
+
+

Added: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/PropsTheoraEncoder.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,22 @@
+#pragma once
+#include "resource.h"
+
+#include <commctrl.h>
+class PropsTheoraEncoder
+	:	public CBasePropertyPage
+{
+public:
+	PropsTheoraEncoder(LPUNKNOWN inUnk, HRESULT* outHR);
+	virtual ~PropsTheoraEncoder(void);
+
+	static CUnknown* WINAPI CreateInstance(LPUNKNOWN inUnk, HRESULT* outHR);
+
+	//CBasePropertyPage Virtual Overrides
+	HRESULT OnActivate(void);
+	HRESULT OnConnect(IUnknown *pUnk);
+	HRESULT OnDisconnect(void);
+	INT_PTR OnReceiveMessage(HWND hwnd,  UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+protected:
+	ITheoraEncodeSettings* mTheoraEncodeSettings;
+};

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.cpp	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.cpp	2004-07-01 20:24:17 UTC (rev 6943)
@@ -42,8 +42,16 @@
TheoraEncodeFilter::CreateInstance,	// Method to create an instance of MyComponent
NULL,									// Initialization function
NULL									// Set-up information (for filters)
+    },
+    {
+		L"Theora Encode Properties",						// Name
+	    &CLSID_PropsTheoraEncoder,            // CLSID
+	    PropsTheoraEncoder::CreateInstance,	// Method to create an instance of MyComponent
+        NULL,									// Initialization function
+        NULL									// Set-up information (for filters)
}

+
};

// Generic way of determining the number of items in the template
@@ -58,7 +66,21 @@
}
return pNewObject;
}
+STDMETHODIMP TheoraEncodeFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
+	if (riid == IID_ITheoraEncodeSettings) {
+		*ppv = (ITheoraEncodeSettings*)this;
+		((IUnknown*)*ppv)->AddRef();
+		return NOERROR;
+	} else if (riid == IID_ISpecifyPropertyPages) {
+		*ppv = (ISpecifyPropertyPages*)this;
+		((IUnknown*)*ppv)->AddRef();
+		return NOERROR;
+	}

+
+	return AbstractVideoEncodeFilter::NonDelegatingQueryInterface(riid, ppv);
+}
+
TheoraEncodeFilter::TheoraEncodeFilter(void)
:	AbstractVideoEncodeFilter(NAME("Theora Encoder"), CLSID_TheoraEncodeFilter, AbstractVideoEncodeFilter::THEORA)
{
@@ -81,4 +103,50 @@

mInputPin = new TheoraEncodeInputPin(this, m_pLock, mOutputPin);
return true;
+}
+
+//Implementation of ITheoraEncodeSEttings
+unsigned long TheoraEncodeFilter::targetBitrate() {
+	return ((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->keyframe_data_target_bitrate;
+}
+unsigned char TheoraEncodeFilter::quality() {
+	return ((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->quality;
+}
+unsigned long TheoraEncodeFilter::keyframeFreq() {
+	return ((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->keyframe_frequency;
+}
+
+bool TheoraEncodeFilter::setTargetBitrate(unsigned long inBitrate) {
+	//Needs error checking
+	((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->keyframe_data_target_bitrate = inBitrate;
+	return true;
+
+}
+bool TheoraEncodeFilter::setQuality(unsigned char inQuality) {
+	//Needs error checking
+	((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->quality = inQuality;
+	return true;
+}
+bool TheoraEncodeFilter::setKeyframeFreq(unsigned long inKeyframeFreq) {
+	//Needs error checking
+	((TheoraEncodeInputPin*)mInputPin)->theoraInfo()->keyframe_frequency = inKeyframeFreq;
+	return true;
+}
+
+//SpecifyPropertyPages Implementation
+STDMETHODIMP TheoraEncodeFilter::GetPages(CAUUID* outPropPages) {
+	if (outPropPages == NULL) return E_POINTER;
+
+	const int NUM_PROP_PAGES = 1;
+    outPropPages->cElems = NUM_PROP_PAGES;
+    outPropPages->pElems = (GUID*)(CoTaskMemAlloc(sizeof(GUID) * NUM_PROP_PAGES));
+    if (outPropPages->pElems == NULL)
+    {
+        return E_OUTOFMEMORY;
+    }
+
+	outPropPages->pElems[0] = CLSID_PropsTheoraEncoder;
+
+    return S_OK;
+
}
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -32,6 +32,8 @@
#pragma once

#include "theoraencoderdllstuff.h"
+#include "ITheoraEncodeSettings.h"
+#include "PropsTheoraEncoder.h"
//#include "AbstractVideoEncodeFilter.h"

//Forward Declarations
@@ -40,20 +42,43 @@
class TheoraEncodeOutputPin;

class TheoraEncodeFilter
+	//Base classes
:	public AbstractVideoEncodeFilter
+	,	public ITheoraEncodeSettings
+	,	public ISpecifyPropertyPages
{
public:
+	//Friends classes
friend class TheoraEncodeInputPin;
friend class TheoraEncodeOutputPin;
+
+	//Constructors and Destructors
TheoraEncodeFilter(void);
virtual ~TheoraEncodeFilter(void);

+	//COM Functions
+	DECLARE_IUNKNOWN
static CUnknown* WINAPI TheoraEncodeFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
+	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);

-	//PURE VIRTUAL IMPLEMENTATION
+	//ITheoraEncodeSettings Implementation
+	unsigned long targetBitrate();
+	unsigned char quality();
+	unsigned long keyframeFreq();
+
+	bool setTargetBitrate(unsigned long inBitrate);
+	bool setQuality(unsigned char inQuality);
+	bool setKeyframeFreq(unsigned long inKeyframeFreq);
+	//
+
+	//AbstractVideoEncodeFilter pure virtuals
virtual bool ConstructPins();
+
+	//SpecifyPropertyPages Implementation
+	STDMETHODIMP TheoraEncodeFilter::GetPages(CAUUID* outPropPages);

protected:
+	//Member data
sTheoraFormatBlock mTheoraFormatBlock;

};

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp	2004-07-01 20:24:17 UTC (rev 6943)
@@ -288,4 +288,8 @@

return S_OK;

+}
+
+theora_info* TheoraEncodeInputPin::theoraInfo() {
+	return &mTheoraInfo;
}
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -32,8 +32,12 @@
#pragma once
#include "theoraencoderdllstuff.h"
#include "TheoraEncoder.h"
-#include "theora/theora.h"

+extern "C" {
+#include "theora_cdecl.h"
+}
+
+
//DEBUG ONLY
#include <fstream>
using namespace std;
@@ -53,7 +57,10 @@
virtual bool ConstructCodec();
virtual void DestroyCodec();
virtual HRESULT SetMediaType(const CMediaType* inMediaType);
+	//

+	theora_info* theoraInfo();
+
protected:
HRESULT mHR;
bool mBegun;

Added: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.aps
===================================================================
(Binary files differ)


Property changes on: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.aps
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.rc
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.rc	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.rc	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,175 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_THEORA_ENCODE_SETTINGS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 189
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 120
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_THEORA_ENCODE_SETTINGS DIALOGEX 0, 0, 196, 127
+STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_BORDER
+FONT 8, "MS Sans Serif", 400, 0, 0x0
+BEGIN
+    COMBOBOX        IDC_COMBO_BITRATE,93,18,83,17,CBS_DROPDOWN | CBS_SORT |
+                    WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Target Bitrate",IDC_STATIC_TBR,23,20,69,12
+    GROUPBOX        "Quality",IDC_GROUP_QUALITY,14,71,167,34
+    CONTROL         "",IDC_SLIDER_QUALITY,"msctls_trackbar32",TBS_AUTOTICKS |
+                    TBS_BOTH | WS_TABSTOP,19,86,159,12
+    LTEXT           "Keyframe Freq log2",IDC_STATIC,23,42,64,11
+    COMBOBOX        IDC_COMBO_KEYFRAME_FREQ,94,38,82,14,CBS_DROPDOWN |
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_THEORA_ENCODE_SETTINGS DLGINIT
+BEGIN
+    IDC_COMBO_BITRATE, 0x403, 6, 0
+0x3631, 0x3030, 0x0030,
+    IDC_COMBO_BITRATE, 0x403, 6, 0
+0x3233, 0x3030, 0x0030,
+    IDC_COMBO_BITRATE, 0x403, 6, 0
+0x3436, 0x3030, 0x0030,
+    IDC_COMBO_BITRATE, 0x403, 7, 0
+0x3231, 0x3038, 0x3030, "\000"
+    IDC_COMBO_BITRATE, 0x403, 7, 0
+0x3532, 0x3036, 0x3030, "\000"
+    IDC_COMBO_BITRATE, 0x403, 7, 0
+0x3135, 0x3032, 0x3030, "\000"
+    IDC_COMBO_BITRATE, 0x403, 8, 0
+0x3031, 0x3432, 0x3030, 0x0030,
+    IDC_COMBO_BITRATE, 0x403, 8, 0
+0x3032, 0x3030, 0x3030, 0x0030,
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 2, 0
+0x0031,
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 2, 0
+0x0032,
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 2, 0
+0x0034,
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 2, 0
+0x0038,
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 3, 0
+0x3631, "\000"
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 3, 0
+0x3233, "\000"
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 3, 0
+0x3436, "\000"
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 4, 0
+0x3231, 0x0038,
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 4, 0
+0x3532, 0x0036,
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 4, 0
+0x3135, 0x0032,
+    IDC_COMBO_KEYFRAME_FREQ, 0x403, 5, 0
+0x3031, 0x3432, "\000"
+    0
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (Australia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_THEORA_ENC_PROPS_STRING "Encoder Settings"
+END
+
+#endif    // English (Australia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj	2004-07-01 20:24:17 UTC (rev 6943)
@@ -20,14 +20,15 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoEncoder;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\libs\libOOTheora;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\libs\libtheora\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORAENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORAENCODER_EXPORTS;__cplusplus"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				DebugInformationFormat="4"
+				CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -112,6 +113,9 @@
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
<File
+				RelativePath="PropsTheoraEncoder.cpp">
+			</File>
+			<File
RelativePath="TheoraEncodeFilter.cpp">
</File>
<File
@@ -146,6 +150,12 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc">
<File
+				RelativePath="ITheoraEncodeSettings.h">
+			</File>
+			<File
+				RelativePath="PropsTheoraEncoder.h">
+			</File>
+			<File
RelativePath="TheoraEncodeFilter.h">
</File>
<File
@@ -155,6 +165,9 @@
RelativePath="TheoraEncodeOutputPin.h">
</File>
<File
+				RelativePath="resource.h">
+			</File>
+			<File
RelativePath="stdafx.h">
</File>
<File
@@ -164,6 +177,9 @@
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			<File
+				RelativePath="dsfTheoraEncoder.rc">
+			</File>
</Filter>
<File
RelativePath="ReadMe.txt">

Added: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/resource.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/resource.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/resource.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,22 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by dsfTheoraEncoder.rc
+//
+#define IDD_THEORA_ENCODE_SETTINGS      102
+#define IDS_THEORA_ENC_PROPS_STRING     103
+#define IDC_COMBO_BITRATE               1001
+#define IDC_STATIC_TBR                  1002
+#define IDC_GROUP_QUALITY               1005
+#define IDC_SLIDER_QUALITY              1006
+#define IDC_COMBO_KEYFRAME_FREQ         1011
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        104
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1012
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -45,6 +45,14 @@
#define LIBOOOGG_API __declspec(dllimport)
#endif

+// {121EA765-6D3F-4519-9686-A0BA6E5281A2}
+DEFINE_GUID(CLSID_PropsTheoraEncoder,
+0x121ea765, 0x6d3f, 0x4519, 0x96, 0x86, 0xa0, 0xba, 0x6e, 0x52, 0x81, 0xa2);
+
+// {4F063B3A-B397-4c22-AFF4-2F8DB96D292A}
+DEFINE_GUID(IID_ITheoraEncodeSettings,
+0x4f063b3a, 0xb397, 0x4c22, 0xaf, 0xf4, 0x2f, 0x8d, 0xb9, 0x6d, 0x29, 0x2a);
+
// {5C769985-C3E1-4f95-BEE7-1101C465F5FC}
DEFINE_GUID(CLSID_TheoraEncodeFilter,
0x5c769985, 0xc3e1, 0x4f95, 0xbe, 0xe7, 0x11, 0x1, 0xc4, 0x65, 0xf5, 0xfc);

Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -33,7 +33,9 @@
#include "libootheora.h"
#include "dllstuff.h"
#include "StampedOggPacket.h"
-#include "theora/theora.h"
+extern "C" {
+#include "theora_cdecl.h"
+}
class LIBOOTHEORA_API TheoraDecoder
{
public:

Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraEncoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraEncoder.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraEncoder.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -33,7 +33,9 @@
#include "libootheora.h"
#include "dllstuff.h"
#include "StampedOggPacket.h"
-#include "theora/theora.h"
+extern "C" {
+#include "theora_cdecl.h"
+}
class LIBOOTHEORA_API TheoraEncoder
{
public:

Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj	2004-07-01 20:24:17 UTC (rev 6943)
@@ -28,7 +28,7 @@
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"
-				CallingConvention="0"/>
+				CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -156,6 +156,9 @@
<File
RelativePath="stdafx.h">
</File>
+			<File
+				RelativePath="theora_cdecl.h">
+			</File>
</Filter>
<Filter
Name="Resource Files"

Added: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/theora_cdecl.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/theora_cdecl.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/theora_cdecl.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,148 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2003                *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+  function:
+  last mod: $Id: theora.h,v 1.18 2004/03/09 06:18:44 msmith Exp $
+
+ ********************************************************************/
+
+#ifndef _O_THEORA_H_
+#define _O_THEORA_H_
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+#ifndef LIBOGG2
+#include <ogg/ogg.h>
+#else
+#include <ogg2/ogg.h>
+/* This is temporary until libogg2 is more complete */
+ogg_buffer_state *ogg_buffer_create(void);
+#endif
+
+typedef struct {
+    int   y_width;
+    int   y_height;
+    int   y_stride;
+
+    int   uv_width;
+    int   uv_height;
+    int   uv_stride;
+    char *y;
+    char *u;
+    char *v;
+
+} yuv_buffer;
+
+typedef enum {
+  OC_CS_UNSPECIFIED,
+  OC_CS_ITU_REC_470M,
+  OC_CS_ITU_REC_470BG,
+} theora_colorspace;
+
+typedef struct {
+  ogg_uint32_t  width;
+  ogg_uint32_t  height;
+  ogg_uint32_t  frame_width;
+  ogg_uint32_t  frame_height;
+  ogg_uint32_t  offset_x;
+  ogg_uint32_t  offset_y;
+  ogg_uint32_t  fps_numerator;
+  ogg_uint32_t  fps_denominator;
+  ogg_uint32_t  aspect_numerator;
+  ogg_uint32_t  aspect_denominator;
+  theora_colorspace colorspace;
+  int           target_bitrate;
+  int           quality;
+  int           quick_p;  /* quick encode/decode */
+
+  /* decode only */
+  unsigned char version_major;
+  unsigned char version_minor;
+  unsigned char version_subminor;
+
+  void *codec_setup;
+
+  /* encode only */
+  int           dropframes_p;
+  int           keyframe_auto_p;
+  ogg_uint32_t  keyframe_frequency;
+  ogg_uint32_t  keyframe_frequency_force;  /* also used for decode init to
+                                              get granpos shift correct */
+  ogg_uint32_t  keyframe_data_target_bitrate;
+  ogg_int32_t   keyframe_auto_threshold;
+  ogg_uint32_t  keyframe_mindistance;
+  ogg_int32_t   noise_sensitivity;
+  ogg_int32_t   sharpness;
+
+} theora_info;
+
+typedef struct{
+  theora_info *i;
+  ogg_int64_t granulepos;
+
+  void *internal_encode;
+  void *internal_decode;
+
+} theora_state;
+
+typedef struct theora_comment{
+  char **user_comments;
+  int   *comment_lengths;
+  int    comments;
+  char  *vendor;
+
+} theora_comment;
+
+#define OC_FAULT       -1
+#define OC_EINVAL      -10
+#define OC_BADHEADER   -20
+#define OC_NOTFORMAT   -21
+#define OC_VERSION     -22
+#define OC_IMPL        -23
+#define OC_BADPACKET   -24
+#define OC_NEWPACKET   -25
+
+extern const char* __cdecl theora_version_string(void);
+extern ogg_uint32_t __cdecl theora_version_number(void);
+extern int __cdecl theora_encode_init(theora_state *th, theora_info *c);
+extern int __cdecl theora_encode_YUVin(theora_state *t, yuv_buffer *yuv);
+extern int __cdecl theora_encode_packetout( theora_state *t, int last_p,
+                                    ogg_packet *op);
+extern int __cdecl theora_encode_header(theora_state *t, ogg_packet *op);
+extern int __cdecl theora_encode_comment(theora_comment *tc, ogg_packet *op);
+extern int __cdecl theora_encode_tables(theora_state *t, ogg_packet *op);
+extern int __cdecl theora_decode_header(theora_info *ci, theora_comment *cc,
+                                ogg_packet *op);
+extern int __cdecl theora_decode_init(theora_state *th, theora_info *c);
+extern int __cdecl theora_decode_packetin(theora_state *th,ogg_packet *op);
+extern int __cdecl theora_decode_YUVout(theora_state *th,yuv_buffer *yuv);
+extern double __cdecl theora_granule_time(theora_state *th,ogg_int64_t granulepos);
+extern void __cdecl theora_info_init(theora_info *c);
+extern void __cdecl theora_info_clear(theora_info *c);
+extern void __cdecl theora_clear(theora_state *t);
+
+extern void __cdecl theora_comment_init(theora_comment *tc);
+extern void __cdecl theora_comment_add(theora_comment *tc, char *comment);
+extern void __cdecl theora_comment_add_tag(theora_comment *tc,
+                                       char *tag, char *value);
+extern char *__cdecl theora_comment_query(theora_comment *tc, char *tag, int count);
+extern int   __cdecl theora_comment_query_count(theora_comment *tc, char *tag);
+extern void  __cdecl theora_comment_clear(theora_comment *tc);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _O_THEORA_H_ */

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-07-01 20:24:17 UTC (rev 6943)
@@ -42,6 +42,14 @@
OggDemuxSourceFilter::CreateInstance,	// Method to create an instance of MyComponent
NULL,									// Initialization function
NULL									// Set-up information (for filters)
+    },
+
+	{
+		L"illiminable About Page",				// Name
+	    &CLSID_PropsAbout,						// CLSID
+	    PropsAbout::CreateInstance,				// Method to create an instance of MyComponent
+        NULL,									// Initialization function
+        NULL									// Set-up information (for filters)
}

};
@@ -70,8 +78,10 @@
*ppv = (IMediaSeeking*)this;
((IUnknown*)*ppv)->AddRef();
return NOERROR;
-
-
+	} else if (riid == IID_ISpecifyPropertyPages) {
+		*ppv = (ISpecifyPropertyPages*)this;
+		((IUnknown*)*ppv)->AddRef();
+		return NOERROR;
}

return CBaseFilter::NonDelegatingQueryInterface(riid, ppv);
@@ -83,6 +93,7 @@
//ANX::: This needs to be changed so these details are passed into the constructor. Or add another parametised constructo
OggDemuxSourceFilter::OggDemuxSourceFilter()
:	CBaseFilter(NAME("OggDemuxSourceFilter"), NULL, m_pLock, CLSID_OggDemuxSourceFilter)
+
,	mSeekTable(NULL)
,	mDataSource(NULL)
{
@@ -131,7 +142,24 @@

}

+//ISpecifyPropertyPgaes Interface
+STDMETHODIMP OggDemuxSourceFilter::GetPages(CAUUID* outPropPages) {
+	if (outPropPages == NULL) return E_POINTER;

+	const int NUM_PROP_PAGES = 1;
+    outPropPages->cElems = NUM_PROP_PAGES;
+    outPropPages->pElems = (GUID*)(CoTaskMemAlloc(sizeof(GUID) * NUM_PROP_PAGES));
+    if (outPropPages->pElems == NULL)
+    {
+        return E_OUTOFMEMORY;
+    }
+
+	outPropPages->pElems[0] = CLSID_PropsAbout;
+
+    return S_OK;
+
+}
+
//IFileSource Interface
STDMETHODIMP OggDemuxSourceFilter::GetCurFile(LPOLESTR* outFileName, AM_MEDIA_TYPE* outMediaType) {
//Return the filename and mediatype of the raw data

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -37,6 +37,7 @@
#include <OggDataBuffer.h>
#include "IFilterDataSource.h"
#include "DataSourceFactory.h"
+#include "PropsAbout.h"
//#include <fstream>
using namespace std;

@@ -49,6 +50,8 @@
public IFileSourceFilter,
public IOggCallback
,	public BasicSeekable
+	,	public ISpecifyPropertyPages
+

{
public:
@@ -80,6 +83,9 @@
//IOggCallback Interface
virtual bool acceptOggPage(OggPage* inOggPage);

+	//ISpecifyPropertyPages
+	virtual STDMETHODIMP GetPages(CAUUID* outPropPages);
+
//Streaming MEthods
STDMETHODIMP Run(REFERENCE_TIME tStart);
STDMETHODIMP Pause(void);

Added: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/PropsAbout.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/PropsAbout.cpp	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/PropsAbout.cpp	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,19 @@
+#include "StdAfx.h"
+#include "propsabout.h"
+
+
+PropsAbout::PropsAbout(LPUNKNOWN inUnk, HRESULT* outHR)
+	:	CBasePropertyPage(NAME("illiminable Directshow Filters"), inUnk, IDD_ILLIMINABLE_ABOUT, IDS_ILLI_ABOUT_STRING_TITLE)
+
+{
+	*outHR = S_OK;
+}
+
+PropsAbout::~PropsAbout(void)
+{
+}
+
+CUnknown* PropsAbout::CreateInstance(LPUNKNOWN inUnk, HRESULT* outHR)
+{
+    return new PropsAbout(inUnk, outHR);
+}

Added: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/PropsAbout.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/PropsAbout.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/PropsAbout.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,15 @@
+#pragma once
+#include "resource.h"
+
+
+class PropsAbout
+	:	public CBasePropertyPage
+{
+public:
+	PropsAbout(LPUNKNOWN inUnk, HRESULT* outHR);
+	virtual ~PropsAbout(void);
+
+	static CUnknown* WINAPI CreateInstance(LPUNKNOWN inUnk, HRESULT* outHR);
+
+
+};

Added: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.aps
===================================================================
(Binary files differ)


Property changes on: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.aps
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.rc
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.rc	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.rc	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,121 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ILLIMINABLE_ABOUT DIALOGEX 0, 0, 210, 154
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_BORDER
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    CTEXT           "illiminable Directshow Filter Package 0.60",
+                    IDC_ABOUT_HEADER,13,15,183,11,WS_BORDER
+    LTEXT           "This filter package provides support for various ogg based media types, including vorbis, speex, theora, cmml, annodex and ogm. This package of filters was written by Zentaro Kavanagh, however several libraries by various other authors are used. Please see the AUTHORS file that accompanies this package for detailed information. The source of these filters is released under a BSD license, please read the COPYRIGHTS files which accompanied this package for detailed license information. Sorry these things are so damn ugly, I hate using MFC. I'll spend some time prettying later !",
+                    IDC_STATIC,13,33,183,106,WS_BORDER
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_ILLIMINABLE_ABOUT, DIALOG
+    BEGIN
+        LEFTMARGIN, 4
+        RIGHTMARGIN, 205
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 147
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (Australia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_ILLI_ABOUT_STRING_TITLE "About"
+END
+
+#endif    // English (Australia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj	2004-07-01 20:24:17 UTC (rev 6943)
@@ -162,6 +162,9 @@
RelativePath="OggStreamMapper.cpp">
</File>
<File
+				RelativePath="PropsAbout.cpp">
+			</File>
+			<File
RelativePath="SpeexStream.cpp">
</File>
<File
@@ -229,6 +232,9 @@
RelativePath="OggStreamMapper.h">
</File>
<File
+				RelativePath="PropsAbout.h">
+			</File>
+			<File
RelativePath="SpeexStream.h">
</File>
<File
@@ -244,12 +250,18 @@
RelativePath="oggdllstuff.h">
</File>
<File
+				RelativePath="resource.h">
+			</File>
+			<File
RelativePath="stdafx.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			<File
+				RelativePath="dsfOggDemux.rc">
+			</File>
</Filter>
<File
RelativePath="ReadMe.txt">

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/oggdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/oggdllstuff.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/oggdllstuff.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -52,6 +52,10 @@
#endif


+// {4BB64C4A-1674-436b-A49D-D6B3B64DBD60}
+DEFINE_GUID(CLSID_PropsAbout,
+0x4bb64c4a, 0x1674, 0x436b, 0xa4, 0x9d, 0xd6, 0xb3, 0xb6, 0x4d, 0xbd, 0x60);
+
//New section
// {31CA0186-1FF0-4181-AA38-3CA4040BD260}
DEFINE_GUID(CLSID_OggDemuxSourceFilter,

Added: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/resource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/resource.h	2004-07-01 11:33:12 UTC (rev 6942)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/resource.h	2004-07-01 20:24:17 UTC (rev 6943)
@@ -0,0 +1,19 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by dsfOggDemux.rc
+//
+#define IDS_ILLI_ABOUT_STRING_TITLE     101
+#define IDD_ILLIMINABLE_ABOUT           106
+#define IDC_ABOUT_HEADER                1001
+#define IDC_RICHEDIT21                  1002
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1003
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif



More information about the commits mailing list