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

illiminable at dactyl.lonelymoon.com illiminable
Tue Jun 29 09:36:52 PDT 2004


src/lib/codecs/theora/filters/dsfTheoraDecoder
src/lib/codecs/theora/filters/dsfTheoraEncoder
src/lib/core/directshow/dsfAbstractVideoEncoder
Message-ID: <20040629163652.02D069AAAD at dactyl.lonelymoon.com>

Author: illiminable
Date: Tue Jun 29 09:36:52 2004
New Revision: 6921

Modified:
trunk/oggdsf/scripts/note2self.txt
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
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/TheoraEncodeOutputPin.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/stdafx.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeInputPin.h
Log:
* Builds again - untested
* Theora Encoder Filter now has all necessary code.

Modified: trunk/oggdsf/scripts/note2self.txt
===================================================================
--- trunk/oggdsf/scripts/note2self.txt	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/scripts/note2self.txt	2004-06-29 16:36:50 UTC (rev 6921)
@@ -17,4 +17,10 @@
Media Player
============

-Need to do all the registry keys to get the media types in the drop boxes of ds apps.
\ No newline at end of file
+Need to do all the registry keys to get the media types in the drop boxes of ds apps.
+
+=========================================
+
+The encoder don't properly fill out their format blocks... this is no
+problem for the muxer, but if you try to chain an encoder to a decoder,
+bad things will happen !
\ No newline at end of file

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-06-29 16:36:50 UTC (rev 6921)
@@ -83,60 +83,60 @@
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.0 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4906E533-2864-4840-ABC1-00CD844623EB}.0 = {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}
{4906E533-2864-4840-ABC1-00CD844623EB}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{4906E533-2864-4840-ABC1-00CD844623EB}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{4906E533-2864-4840-ABC1-00CD844623EB}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.0 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{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}
+		{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}
{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.1 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{6B548F29-04A2-4F61-946F-72B86B4845DA}.0 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{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}.0 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.1 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.2 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.3 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.4 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.3 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.0 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{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}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.1 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{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}
+		{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}
{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.1 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{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}
+		{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}
{D74A626E-C8CB-4787-913E-2E637FC04F2B}.2 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{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}
+		{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}
{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{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}
+		{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}
{419E0701-9C9A-4671-B3B6-79FA206DEE25}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.3 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.3 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.0 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{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}
+		{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}
{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.3 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.4 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.3 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.4 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{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}
@@ -168,355 +168,420 @@
{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 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.31 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.32 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.33 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.34 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.35 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.36 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.37 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.38 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.39 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.40 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.41 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.42 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.43 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.44 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.45 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.46 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.47 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.48 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.49 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.50 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.51 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.52 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.53 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.54 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.55 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.56 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.57 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.58 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.59 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.60 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.61 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.62 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.63 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.64 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.65 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.66 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.67 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.68 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.69 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.70 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.71 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.72 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.73 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.74 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.75 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.76 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.77 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.78 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.79 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.80 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.81 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.82 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.83 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.84 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.85 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.86 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.87 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.88 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.89 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.90 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.91 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.92 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.93 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.94 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.95 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.96 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.97 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.98 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.99 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.100 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.101 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.102 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.103 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.104 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.105 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.106 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.107 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.108 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.109 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.110 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.111 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.112 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.113 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.114 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.115 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.116 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.117 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.118 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.119 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.120 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.121 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.122 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.123 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.124 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.125 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.126 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.127 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.128 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.129 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.130 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.131 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.132 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.133 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.134 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.135 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.136 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.137 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.138 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.139 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.140 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.141 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.142 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.143 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.144 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.145 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.146 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.147 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.148 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.149 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.150 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.151 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{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 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.154 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.155 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.156 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.157 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.158 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.159 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.160 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.161 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.162 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.163 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.164 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.165 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.166 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.167 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.168 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.169 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.170 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.171 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.172 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.173 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.174 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.175 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.176 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.177 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.178 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.179 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.180 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.181 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.182 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.183 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.184 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.185 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.186 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.187 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.188 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.189 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.190 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.191 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.192 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.193 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.194 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.195 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.196 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.197 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.198 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.199 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.200 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.201 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.202 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.203 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.204 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.205 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.206 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.207 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.208 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.209 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.210 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.211 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.212 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.213 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.214 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.215 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.216 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.217 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.218 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.219 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.220 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.221 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.222 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.223 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.224 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.225 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.226 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.227 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.228 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.229 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.230 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.231 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.232 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.233 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.234 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.235 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.236 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.237 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.238 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.239 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.240 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{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}.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}.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}.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}.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}.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 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.243 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.244 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.245 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.246 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.247 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.248 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.249 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.250 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.251 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.252 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.253 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.254 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.255 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.256 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.257 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.258 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.259 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.260 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.261 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.262 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.263 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.264 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.265 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.266 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.267 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.268 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.269 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.270 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.271 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.272 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.273 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.274 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.275 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.276 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.277 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.278 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.279 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.280 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.281 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.282 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.283 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.284 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.285 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.286 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.287 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.288 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.289 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.290 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.291 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.292 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.293 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.294 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.295 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.296 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.297 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.298 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.299 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.300 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.301 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.302 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.303 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.304 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.305 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.306 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.307 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.308 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.309 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.310 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.311 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.312 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.313 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.314 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.315 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.316 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.317 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.318 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.319 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.320 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.321 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.322 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.323 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.324 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.325 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.326 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.327 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.328 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.329 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.330 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.331 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.332 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.333 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.334 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.335 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.336 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.337 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.338 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.339 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.340 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.341 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.342 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.343 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.344 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.345 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.346 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.347 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.348 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.349 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.350 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.351 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.352 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.353 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.354 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.355 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.356 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.357 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.358 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.359 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.360 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.361 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.362 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.363 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{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}.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}.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}.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}
{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.0 = {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}.0 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.1 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{F9F22B14-22FE-4651-81B8-5AE267A6B189}.2 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.3 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.4 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.3 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.4 = {AE32588D-2807-4796-9E68-C9104817BC1A}
{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}.3 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.4 = {AD2DC5BB-AC7B-482D-9472-19BB98A833CE}
{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.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}
+		{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}
{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{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}
+		{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}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Debug.ActiveCfg = Debug|Win32

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h	2004-06-29 16:36:50 UTC (rev 6921)
@@ -67,7 +67,7 @@
//FishSound* mFishSound;
//FishSoundInfo mFishInfo;
TheoraDecoder* mTheoraDecoder;
+


-
};

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeFilter.h	2004-06-29 16:36:50 UTC (rev 6921)
@@ -32,10 +32,10 @@
#pragma once

#include "theoraencoderdllstuff.h"
-#include "AbstractVideoEncodeFilter.h"
+//#include "AbstractVideoEncodeFilter.h"

//Forward Declarations
-struct sTheoraFormatBlock;
+//struct sTheoraFormatBlock;
class TheoraEncodeInputPin;
class TheoraEncodeOutputPin;


Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp	2004-06-29 16:36:50 UTC (rev 6921)
@@ -34,20 +34,169 @@

TheoraEncodeInputPin::TheoraEncodeInputPin(AbstractVideoEncodeFilter* inParentFilter, CCritSec* inFilterLock, AbstractVideoEncodeOutputPin* inOutputPin)
:	AbstractVideoEncodeInputPin(inParentFilter, inFilterLock, inOutputPin, NAME("TheoraEncodeInputPin"), L"YV12 In")
-	,	mFishSound(NULL)
+	,	mBegun(false)
+
{
+	mYUV.y = NULL;
+	mYUV.u = NULL;
+	mYUV.v = NULL;

}

TheoraEncodeInputPin::~TheoraEncodeInputPin(void)
{
DestroyCodec();
+	delete mYUV.y;
+	delete mYUV.u;
+	delete mYUV.v;
+
}


+HRESULT TheoraEncodeInputPin::deliverData(LONGLONG inStart, LONGLONG inEnd, unsigned char* inBuf, unsigned long inNumBytes) {
+	//Get a pointer to a new sample stamped with our time
+	IMediaSample* locSample;
+	HRESULT locHR = mOutputPin->GetDeliveryBuffer(&locSample, &inStart, &inEnd, NULL);
+
+	if (locHR != S_OK) {
+		//We get here when the application goes into stop mode usually.
+		return locHR;
+	}
+
+	BYTE* locBuffer = NULL;
+
+
+	//Make our pointers set to point to the samples buffer
+	locSample->GetPointer(&locBuffer);
+
+	if (locSample->GetSize() >= inNumBytes) {
+
+		memcpy((void*)locBuffer, (const void*)inBuf, inNumBytes);
+
+		//Set the sample parameters.
+		SetSampleParams(locSample, inNumBytes, &inStart, &inEnd);
+
+		{
+			CAutoLock locLock(m_pLock);
+
+			HRESULT locHR = mOutputPin->mDataQueue->Receive(locSample);						//->DownstreamFilter()->Receive(locSample);
+			if (locHR != S_OK) {
+				return locHR;
+			} else {
+			}
+		}
+
+		return S_OK;
+	} else {
+		throw 0;
+	}
+
+}
//PURE VIRTUALS
long TheoraEncodeInputPin::encodeData(unsigned char* inBuf, long inNumBytes) {

+	//Time stamps are granule pos not directshow times
+
+	LONGLONG locFrameStart = mUptoFrame;
+	LONGLONG locFrameEnd = 0;
+	HRESULT locHR = S_OK;
+	if (!mBegun) {
+		mBegun = true;
+
+		StampedOggPacket** locHeaders;
+		locHeaders = mTheoraEncoder.initCodec(mTheoraInfo);
+
+		for (int i = 0; i < 3; i++) {
+			locHR = deliverData(0,0,locHeaders[i]->packetData(), locHeaders[i]->packetSize());
+			if (locHR != S_OK) {
+				return locHR;
+			}
+		}
+	}
+
+	//yuv_buffer* locYUV = new yuv_buffer;
+
+
+
+	////Fill the buffer with yuv data...
+	////
+
+	////Y Data.
+	//for ( long line = 0; line < inYUVBuffer->y_height; line++) {
+	//	memcpy((void*)locBuffer, (const void*)(inYUVBuffer->y + (inYUVBuffer->y_stride * (line))), inYUVBuffer->y_width);
+	//	locBuffer += inYUVBuffer->y_width;
+
+	unsigned char* locUptoPtr = inBuf;  //View only... don't delete locUptoPtr
+
+	for (long line = 0; line < mYUV.y_height; line++) {
+		memcpy((void*)mYUV.y, (const void*)locUptoPtr, mYUV.y_width);
+		locUptoPtr += mYUV.y_width;
+	}
+
+	//	if (mWidth > inYUVBuffer->y_width) {
+	//		memset((void*)locBuffer, 0, mWidth - inYUVBuffer->y_width);
+	//	}
+	//	locBuffer += mWidth - inYUVBuffer->y_width;
+	//}
+
+	////Pad height...
+	//for ( long line = 0; line < mHeight - inYUVBuffer->y_height; line++) {
+	//	memset((void*)locBuffer, 0, mWidth);
+	//	locBuffer += mWidth;
+	//}
+
+	////V Data
+	//for ( long line = 0; line < inYUVBuffer->uv_height; line++) {
+	//	memcpy((void*)locBuffer, (const void*)(inYUVBuffer->v + (inYUVBuffer->uv_stride * (line))), inYUVBuffer->uv_width);
+	//	locBuffer += inYUVBuffer->uv_width;
+
+	for (long line = 0; line < mYUV.uv_height; line++) {
+		memcpy((void*)mYUV.v, (const void*)locUptoPtr, mYUV.uv_width);
+		locUptoPtr += mYUV.uv_width;
+
+	}
+	//	if (mWidth/2 > inYUVBuffer->uv_width) {
+	//		memset((void*)locBuffer, 0, (mWidth/2) - inYUVBuffer->uv_width);
+	//	}
+	//	locBuffer += (mWidth/2) - inYUVBuffer->uv_width;
+	//}
+
+	////Pad height...
+	//for ( long line = 0; line < (mHeight/2) - inYUVBuffer->uv_height; line++) {
+	//	memset((void*)locBuffer, 0, mWidth/2);
+	//	locBuffer += mWidth/2;
+	//}
+
+	////U Data
+	//for (long line = 0; line < inYUVBuffer->uv_height; line++) {
+	//	memcpy((void*)locBuffer, (const void*)(inYUVBuffer->u + (inYUVBuffer->uv_stride * (line))), inYUVBuffer->uv_width);
+	//	locBuffer += inYUVBuffer->uv_width;
+
+	for (long line = 0; line < mYUV.uv_height; line++) {
+		memcpy((void*)mYUV.u, (const void*)locUptoPtr, mYUV.uv_width);
+		locUptoPtr += mYUV.uv_width;
+	}
+	//	if (mWidth/2 > inYUVBuffer->uv_width) {
+	//		memset((void*)locBuffer, 0, (mWidth/2) - inYUVBuffer->uv_width);
+	//	}
+	//	locBuffer += (mWidth/2) - inYUVBuffer->uv_width;
+	//}
+
+	////Pad height...
+	//for ( long line = 0; line < (mHeight/2) - inYUVBuffer->uv_height; line++) {
+	//	memset((void*)locBuffer, 0, mWidth/2);
+	//	locBuffer += mWidth/2;
+	//}
+
+
+
+
+	StampedOggPacket* locPacket = mTheoraEncoder.encodeTheora(&mYUV);
+	locFrameEnd		= mUptoFrame
+					= locPacket->endTime();
+
+	return deliverData(locFrameStart, locFrameEnd, locPacket->packetData(), locPacket->packetSize());
+



@@ -78,9 +227,129 @@
//} else {
//
//}
-	return locErr;
+
}
bool TheoraEncodeInputPin::ConstructCodec() {
+//	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;
+
+//theora_info_init(&ti);
+//  ti.width=video_x;
+//  ti.height=video_y;
+//  ti.frame_width=frame_x;
+//  ti.frame_height=frame_y;
+//  ti.offset_x=frame_x_offset;
+//  ti.offset_y=frame_y_offset;
+//  ti.fps_numerator=video_hzn;
+//  ti.fps_denominator=video_hzd;
+//  ti.aspect_numerator=video_an;
+//  ti.aspect_denominator=video_ad;
+//  ti.colorspace=OC_CS_UNSPECIFIED;
+//  ti.target_bitrate=video_r;
+//  ti.quality=video_q;
+//
+//  ti.dropframes_p=0;
+//  ti.quick_p=1;
+//  ti.keyframe_auto_p=1;
+//  ti.keyframe_frequency=64;
+//  ti.keyframe_frequency_force=64;
+//  ti.keyframe_data_target_bitrate=video_r*1.5;
+//  ti.keyframe_auto_threshold=80;
+//  ti.keyframe_mindistance=8;
+//  ti.noise_sensitivity=1;
+
+	theora_info_init(&mTheoraInfo);
+
+	mTheoraInfo.width	=	mWidth
+						=	mYUV.y_width
+						=	mYUV.y_stride
+						=	mVideoFormat->bmiHeader.biWidth;
+
+	mYUV.uv_width		=	mYUV.uv_stride
+						=	mWidth/2;
+
+	mTheoraInfo.height	=	mHeight
+						=	mYUV.y_height
+						=	mYUV.y_width
+						=	mVideoFormat->bmiHeader.biHeight;
+
+	mYUV.uv_height		=	mHeight/2;
+
+	mYUV.y				=	new char[(mHeight * mWidth)];
+	mYUV.u				=	new char[(mHeight * mWidth)/4];
+	mYUV.v				=	new char[(mHeight * mWidth)/4];
+
+	mTheoraInfo.frame_width=mVideoFormat->bmiHeader.biWidth;
+	mTheoraInfo.frame_height=mVideoFormat->bmiHeader.biHeight;
+	mTheoraInfo.offset_x=0;
+	mTheoraInfo.offset_y=0;
+
+
+	//HACK:::Bit of a hack to convert dshow nanos to a fps num/denom.
+	unsigned long locNum = (((double)10000000) / ((double)mVideoFormat->AvgTimePerFrame)) + (double)0.5;
+
+	mTheoraInfo.fps_numerator = locNum;
+	mTheoraInfo.fps_denominator = 1;
+	//I don't think this is right !
+	mTheoraInfo.aspect_numerator=mVideoFormat->bmiHeader.biWidth;//video_an;
+	mTheoraInfo.aspect_denominator=mVideoFormat->bmiHeader.biHeight;//video_ad;
+	//
+	mTheoraInfo.colorspace=OC_CS_UNSPECIFIED;
+	mTheoraInfo.target_bitrate=mVideoFormat->dwBitRate;
+	//Hard code for now
+	mTheoraInfo.quality=16; //video_q;
+
+	mTheoraInfo.dropframes_p=0;
+	mTheoraInfo.quick_p=1;
+	mTheoraInfo.keyframe_auto_p=1;
+	mTheoraInfo.keyframe_frequency=64;
+	mTheoraInfo.keyframe_frequency_force=64;
+	mTheoraInfo.keyframe_data_target_bitrate=mVideoFormat->dwBitRate*1.5;
+	mTheoraInfo.keyframe_auto_threshold=80;
+	mTheoraInfo.keyframe_mindistance=8;
+	mTheoraInfo.noise_sensitivity=1;
+
+
+
+
+
+
+
+
//mFishInfo.channels = mWaveFormat->nChannels;
//mFishInfo.format = FISH_SOUND_VORBIS;
//mFishInfo.samplerate = mWaveFormat->nSamplesPerSec;

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.h	2004-06-29 16:36:50 UTC (rev 6921)
@@ -30,13 +30,15 @@
//===========================================================================

#pragma once
+#include "theoraencoderdllstuff.h"
+#include "TheoraEncoder.h"
+#include "theora/theora.h"
+//#include "AbstractVideoEncodeInputPin.h"
+//#include "TheoraEncodeInputPin.h"

-#include "AbstractVideoEncodeInputPin.h"
-#include "TheoraEncodeInputPin.h"
+//#include "TheoraEncodeFilter.h"

-#include "TheoraEncodeFilter.h"
-
-
+class TheoraEncodeOutputPin;
class TheoraEncodeInputPin
:	public AbstractVideoEncodeInputPin
{
@@ -44,7 +46,7 @@
TheoraEncodeInputPin(AbstractVideoEncodeFilter* inFilter, CCritSec* inFilterLock, AbstractVideoEncodeOutputPin* inOutputPin);
virtual ~TheoraEncodeInputPin(void);

-	//static int TheoraEncodeInputPin::VorbisEncoded (FishSound* inFishSound, unsigned char* inPacketData, long inNumBytes, void* inThisPointer) ;
+
//PURE VIRTUALS
virtual long encodeData(unsigned char* inBuf, long inNumBytes);
virtual bool ConstructCodec();
@@ -54,11 +56,17 @@
protected:
HRESULT mHR;
bool mBegun;
-	//VorbisDecodeOutputPin* mOutputPin;
-	//__int64 mUptoFrame;

-	//FishSound* mFishSound;
-	//FishSoundInfo mFishInfo;
+	HRESULT deliverData(LONGLONG inStart, LONGLONG inEnd, unsigned char* inBuf, unsigned long inNumBytes);
+	//
+//	bool fillTheoraInfo(theora_info* outTheora, sTheoraFormatBlock* inTheoraFormatBlock);
+	//
+	TheoraEncodeOutputPin* mOutputPin;
+	__int64 mUptoFrame;

+	TheoraEncoder mTheoraEncoder;
+	theora_info mTheoraInfo;
+	yuv_buffer mYUV;
+

};

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeOutputPin.h	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeOutputPin.h	2004-06-29 16:36:50 UTC (rev 6921)
@@ -31,8 +31,8 @@

#pragma once

-#include "Theoraencoderdllstuff.h"
-#include "AbstractVideoEncodeOutputPin.h"
+#include "theoraencoderdllstuff.h"
+//#include "AbstractVideoEncodeOutputPin.h"

class TheoraEncodeFilter;
struct sTheoraFormatBlock;

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/dsfTheoraEncoder.vcproj	2004-06-29 16:36:50 UTC (rev 6921)
@@ -19,10 +19,11 @@
<Tool
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"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
@@ -31,8 +32,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+				AdditionalDependencies="Strmbasd.lib Msvcrtd.lib Winmm.lib Strmiids.lib  Quartz.lib"
OutputFile="$(OutDir)/dsfTheoraEncoder.dll"
LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Debug&quot;"
ModuleDefinitionFile="theoraencoder.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/dsfTheoraEncoder.pdb"
@@ -65,14 +68,16 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoEncoder;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\libs\libOOTheora;..\..\libs\libtheora\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORAENCODER_EXPORTS"
StringPooling="TRUE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="3"
-				WarningLevel="3"
+				WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				DebugInformationFormat="3"
+				CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/stdafx.h	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/stdafx.h	2004-06-29 16:36:50 UTC (rev 6921)
@@ -10,3 +10,10 @@
#include <windows.h>

// TODO: reference additional headers your program requires here
+#include "theoraencoderdllstuff.h"
+#include "AbstractVideoEncodeFilter.h"
+#include "AbstractVideoEncodeInputPin.h"
+#include "AbstractVideoEncodeOutputPin.h"
+#include "TheoraEncodeInputPin.h"
+#include "TheoraEncodeOutputPin.h"
+#include "TheoraEncodeFilter.h"
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.cpp	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.cpp	2004-06-29 16:36:50 UTC (rev 6921)
@@ -1,10 +1,100 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
#include "StdAfx.h"
+
#include "theoraencoderdllstuff.h"

-theoraencoderdllstuff::theoraencoderdllstuff(void)
+extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID);
+BOOL APIENTRY DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved)
{
+    return DllEntryPoint((HINSTANCE)(hModule), dwReason, lpReserved);
}

-theoraencoderdllstuff::~theoraencoderdllstuff(void)
+
+//The folowing two functions do the registration and deregistration of the dll and it's contained com objects.
+STDAPI DllRegisterServer()
{
+
+	//TO DO::: Should we be releasing the filter mapper even when we return early ?
+    HRESULT hr;
+    IFilterMapper2* locFilterMapper = NULL;
+
+    hr = AMovieDllRegisterServer2(TRUE);
+
+
+
+
+    hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, IID_IFilterMapper2, (void **)&locFilterMapper);
+
+
+	hr = locFilterMapper->RegisterFilter(
+		CLSID_TheoraEncodeFilter,						// Filter CLSID.
+		L"Theora Encode Filter",							// Filter name.
+        NULL,										// Device moniker.
+        &CLSID_LegacyAmFilterCategory,				// Direct Show general category
+        L"Theora Encode Filter",							// Instance data. ???????
+        &TheoraEncodeFilterReg								// Pointer to filter information.
+    );
+
+    locFilterMapper->Release();
+
+    return hr;
+
}
+
+STDAPI DllUnregisterServer()
+{
+   HRESULT hr;
+    IFilterMapper2* locFilterMapper = NULL;
+
+    hr = AMovieDllRegisterServer2(FALSE);
+	if (FAILED(hr)) {
+
+        return hr;
+	}
+
+    hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,
+            IID_IFilterMapper2, (void **)&locFilterMapper);
+
+	if (FAILED(hr)) {
+        return hr;
+	}
+
+
+    hr = locFilterMapper->UnregisterFilter(&CLSID_LegacyAmFilterCategory, L"Theora Encode Filter", CLSID_TheoraEncodeFilter);
+
+
+	//
+    locFilterMapper->Release();
+    return hr;
+
+}

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h	2004-06-29 16:36:50 UTC (rev 6921)
@@ -33,14 +33,12 @@



+#include <streams.h>
+#include <pullpin.h>
+#include <initguid.h>

-#include "AbstractVideoEncodeFilter.h"
-#include "AbstractVideoEncodeInputPin.h"
-#include "AbstractVideoEncodeOutputPin.h"
-#include "TheoraEncodeInputPin.h"
-#include "TheoraEncodeOutputPin.h"
-#include "TheoraEncodeFilter.h"

+
#ifdef LIBOOOGG_EXPORTS
#define LIBOOOGG_API __declspec(dllexport)
#else

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeInputPin.cpp	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeInputPin.cpp	2004-06-29 16:36:50 UTC (rev 6921)
@@ -37,6 +37,8 @@
mUptoFrame(0),
mBegun(false),
mParentFilter(inParentFilter)
+	,	mHeight(0)
+	,	mWidth(0)

{
//debugLog.open("C:\\temp\\aaein.log", ios_base::out);

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeInputPin.h	2004-06-29 08:25:06 UTC (rev 6920)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeInputPin.h	2004-06-29 16:36:50 UTC (rev 6921)
@@ -86,4 +86,6 @@
//unsigned long mSampleRate;

VIDEOINFOHEADER* mVideoFormat;
+	long mHeight;
+	long mWidth;
};



More information about the commits mailing list