[xiph-commits] r11896 - in trunk/oggdsf: sln/oggdsf_all src/lib/codecs/speex/filters/dsfSpeexEncoder src/lib/codecs/speex/libs/libOOSpeex

illiminable at svn.xiph.org illiminable at svn.xiph.org
Tue Oct 10 03:12:38 PDT 2006


Author: illiminable
Date: 2006-10-10 03:12:24 -0700 (Tue, 10 Oct 2006)
New Revision: 11896

Modified:
   trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.cpp
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.h
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeOutputPin.cpp
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeOutputPin.h
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/dsfSpeexEncoder.vcproj
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.h
   trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncodeSettings.cpp
   trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.cpp
Log:
* Speex encode filter has all the configuration options exposed in speexenc
* Tidy up speex encode filter

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2006-10-10 10:12:24 UTC (rev 11896)
@@ -9,17 +9,17 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggSeek", "..\..\src\lib\core\ogg\libOOOggSeek\libOOOggSeek.vcproj", "{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggMux", "..\..\src\lib\core\directshow\dsfOggMux\dsfOggMux.vcproj", "{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_dynamic", "..\..\src\lib\codecs\flac\libs\libflac\src\libFLAC\libFLAC_dynamic.vcproj", "{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}"
@@ -31,12 +31,12 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACDecoder", "..\..\src\lib\codecs\flac\filters\dsfFLACDecoder\dsfFLACDecoder.vcproj", "{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "..\..\src\lib\codecs\vorbis\libs\libvorbis\win32\vorbis_dynamic.vcproj", "{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}"
@@ -46,69 +46,70 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
 	ProjectSection(ProjectDependencies) = postProject
+		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfishsound", "..\..\src\lib\codecs\helper\libfishsound\win32\libfishsound.vcproj", "{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}"
 	ProjectSection(ProjectDependencies) = postProject
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
 		{6D653C6F-8722-4B10-9C3A-CB7094DD159F} = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "..\..\src\lib\codecs\speex\libs\libspeex\win32\VS2005\libspeex\libspeex.vcproj", "{6D653C6F-8722-4B10-9C3A-CB7094DD159F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexDecoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexDecoder\dsfSpeexDecoder.vcproj", "{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{6D653C6F-8722-4B10-9C3A-CB7094DD159F} = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
+		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
-		{6D653C6F-8722-4B10-9C3A-CB7094DD159F} = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexEncoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexEncoder\dsfSpeexEncoder.vcproj", "{419E0701-9C9A-4671-B3B6-79FA206DEE25}"
 	ProjectSection(ProjectDependencies) = postProject
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTheora", "..\..\src\lib\codecs\theora\libs\libOOTheora\libOOTheora.vcproj", "{6B20BD7A-644B-4087-9CAC-71B2D68D0231}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{A95E7EE6-21EB-4D62-A26F-95A2F5F069C5} = {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{A95E7EE6-21EB-4D62-A26F-95A2F5F069C5} = {A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraDecoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraDecoder\dsfTheoraDecoder.vcproj", "{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggDump", "..\..\src\tools\OOOggDump\OOOggDump.vcproj", "{73D3CA81-3BDC-42F1-8456-76224F6B337C}"
@@ -118,6 +119,555 @@
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "oggcodecs", "..\..\build\oggcodecs\oggcodecs.vdproj", "{3214DF66-3E46-4E44-BF9D-BC7502B88C29}"
 	ProjectSection(ProjectDependencies) = postProject
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
@@ -146,555 +696,6 @@
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25} = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3} = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{48CFEC13-E2BC-412F-8ECA-29090C7193B6} = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1} = {8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{73D3CA81-3BDC-42F1-8456-76224F6B337C} = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{88532BA9-1EED-421F-84BF-88A7A87FB2D3} = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4} = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139} = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2} = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggStat", "..\..\src\tools\OOOggStat\OOOggStat.vcproj", "{48CFEC13-E2BC-412F-8ECA-29090C7193B6}"
@@ -711,64 +712,64 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraEncoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraEncoder\dsfTheoraEncoder.vcproj", "{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libWinCMMLParse", "..\..\src\lib\codecs\cmml\libWinCMMLParse\libWinCMMLParse.vcproj", "{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLDecoder", "..\..\src\lib\codecs\cmml\dsfCMMLDecoder\dsfCMMLDecoder.vcproj", "{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libVorbisComment", "..\..\src\lib\core\ogg\libVorbisComment\libVorbisComment.vcproj", "{DC4D86E2-72C1-4995-8FB1-0F08655E620A}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggCommentDump", "..\..\src\tools\OOOggCommentDump\OOOggCommentDump.vcproj", "{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLOgg", "..\..\src\tools\CLOgg\CLOgg.vcproj", "{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDSPlayDotNET", "..\..\src\lib\player\libDSPlayDotNET\libDSPlayDotNET.vcproj", "{E274665B-12E3-4C7F-A749-FAB0C0A73522}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
 		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6} = {9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}
-		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiWrapper", "..\..\src\lib\helper\libiWrapper\libiWrapper.vcproj", "{FCFE729D-EADE-45BA-9506-7E82A46403F7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DNPlay", "..\..\src\tools\DNPlay\DNPlay.csproj", "{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6} = {9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522} = {E274665B-12E3-4C7F-A749-FAB0C0A73522}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6} = {9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCDROM", "..\..\src\lib\helper\libCDROM\libCDROM.vcproj", "{53C3466C-6107-41CD-80D2-5F1D423D66F3}"
@@ -780,26 +781,26 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLTagsDotNET", "..\..\src\lib\codecs\cmml\libCMMLTagsDotNET\libCMMLTagsDotNET.vcproj", "{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACEncoder", "..\..\src\lib\codecs\flac\filters\dsfFLACEncoder\dsfFLACEncoder.vcproj", "{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libVorbisCommentDotNET", "..\..\src\lib\core\ogg\libVorbisCommentDotNET\libVorbisCommentDotNET.vcproj", "{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
 		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOCE", "..\..\src\tools\iOCE\iOCE.csproj", "{8BFD6626-7D04-4DB8-836C-767DBD256F33}"
@@ -831,17 +832,17 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libannodex", "..\..\src\lib\core\annodex\libannodex\win32\libannodex\libannodex.vcproj", "{13BFE1FF-00A7-4741-B550-95445D9E0561}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
 		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4} = {16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLRawSource", "..\..\src\lib\codecs\cmml\dsfCMMLRawSource\dsfCMMLRawSource.vcproj", "{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
+		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iDSHelper", "..\..\src\lib\helper\iDSHelper\iDSHelper.vcproj", "{053D669F-E874-44C6-9705-8A1DEF40C4E9}"
@@ -877,52 +878,52 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfNativeFLACSource", "..\..\src\lib\codecs\flac\filters\dsfNativeFLACSource\dsfNativeFLACSource.vcproj", "{43DEE58F-CEC6-49B4-BC06-3D28978BAB63}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{6B548F29-04A2-4F61-946F-72B86B4845DA} = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA} = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oggChainSplitter", "..\..\src\tools\oggChainSplitter\oggChainSplitter.vcproj", "{F3ECBC6B-ED14-4E76-8513-1BCDCF8F412E}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{DC4D86E2-72C1-4995-8FB1-0F08655E620A} = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDirectshowAbstracts", "..\..\src\lib\core\directshow\libDirectshowAbstracts\libDirectshowAbstracts.vcproj", "{EA7091BB-9906-41DF-9738-F4858A136086}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testLibOOOgg", "..\..\src\tests\testLibOOOgg\testLibOOOgg.vcproj", "{6B993E86-7283-4324-B4C4-F047930FB5FF}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAnxMux", "..\..\src\lib\core\directshow\dsfAnxMux\dsfAnxMux.vcproj", "{685D495F-1620-459A-9EE3-BAD4F619B2C2}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834} = {6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834} = {6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testCMMLParser", "..\..\src\tests\testCMMLParser\testCMMLParser.vcproj", "{BF72BA81-0735-46FB-8C8C-E36758477756}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 	EndProjectSection
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "WinCMMLToolsAndTests", "..\..\build\WinCMMLToolsAndTests\WinCMMLToolsAndTests.vdproj", "{C6EE2F72-1743-47CA-B8A8-001E7C9CEEBA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AnxCutter", "..\..\src\tools\AnxCutter\AnxCutter.vcproj", "{D50F8622-3E33-4EFC-8961-0FB7641F884B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggSeekFileMaker", "..\..\src\tools\OOOggSeekFileMaker\OOOggSeekFileMaker.vcproj", "{777D44B3-6690-4C25-B4CC-F5CD4579E932}"
@@ -932,48 +933,48 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggSeekFileReader", "..\..\src\tools\OOOggSeekFileReader\OOOggSeekFileReader.vcproj", "{F6B75B61-4BEF-4323-B15E-37AFFC9CB52A}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggPageInfo", "..\..\src\tools\OOOggPageInfo\OOOggPageInfo.vcproj", "{EE19996C-FEB3-4247-9EEF-490C854177B0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggSeekFileQuery", "..\..\src\tools\OOOggSeekFileQuery\OOOggSeekFileQuery.vcproj", "{764F4A5C-AABE-4E10-937F-2E5ECDAAF29C}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CMMLDump", "..\..\src\tools\CMMLDump\CMMLDump.vcproj", "{3A7DAD80-4C79-48FB-B779-8CEA4EE9CF90}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_oggchef", "..\..\src\tools\mod_oggchef\mod_oggchef.vcproj", "{F8FDD992-E21A-483F-BBE7-305D10163DE4}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3D55194E-6732-4A74-A947-EDFF585A0F19} = {3D55194E-6732-4A74-A947-EDFF585A0F19}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3D55194E-6732-4A74-A947-EDFF585A0F19} = {3D55194E-6732-4A74-A947-EDFF585A0F19}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testVideoImageGrab", "..\..\src\tests\testVideoImageGrab\testVideoImageGrab.csproj", "{A7E7277C-1F4A-4F43-97F7-ABD1C61FD6EB}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggChef", "..\..\src\lib\helper\libOOOggChef\libOOOggChef.vcproj", "{3D55194E-6732-4A74-A947-EDFF585A0F19}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libTemporalURI", "..\..\src\lib\helper\libTemporalURI\libTemporalURI.vcproj", "{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}"
@@ -988,8 +989,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLParseDotNET", "..\..\src\lib\codecs\cmml\libCMMLParseDotNET\libCMMLParseDotNET.vcproj", "{150940C1-A4EF-474D-8703-DF7100ABDA52}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggPacketise", "..\..\src\tools\OOOggPacketise\OOOggPacketise.vcproj", "{463B5ED7-C6A3-4343-BA67-B324580BEC70}"
@@ -999,24 +1000,24 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testOOOggChef", "..\..\src\tests\testOOOggChef\testOOOggChef.vcproj", "{1D3F3520-FD46-4C72-B2AA-A917AB368053}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
+		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
 		{3D55194E-6732-4A74-A947-EDFF585A0F19} = {3D55194E-6732-4A74-A947-EDFF585A0F19}
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLParse", "..\..\src\lib\codecs\cmml\libCMMLParse\libCMMLParse.vcproj", "{899EB7AD-26BF-4495-9BE5-EADECCC288B2}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAnxHelper", "..\..\src\lib\helper\libAnxHelper\libAnxHelper.vcproj", "{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CMMLRip", "..\..\src\tools\CMMLRip\CMMLRip.vcproj", "{0A99562D-4B28-4F0C-93B2-06186069B9C0}"
@@ -1025,45 +1026,45 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libTemporalURIDotNET", "..\..\src\lib\helper\libTemporalURIDotNET\libTemporalURIDotNET.vcproj", "{E36945ED-A48B-40EC-A1F3-B90EDFDD3F00}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
 		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
-		{FCFE729D-EADE-45BA-9506-7E82A46403F7} = {FCFE729D-EADE-45BA-9506-7E82A46403F7}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggDemux2", "..\..\src\lib\core\directshow\dsfOggDemux2\dsfOggDemux2.vcproj", "{304B710A-7355-471C-A4A8-9E8F6D640E6D}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOGMDecoder", "..\..\src\lib\codecs\ogm\filters\dsfOGMDecoder\dsfOGMDecoder.vcproj", "{1C4F9412-B1DE-4E65-96C1-89522EF02997}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggRawAudioInserter", "..\..\src\lib\codecs\RawAudio\dsfOggRawAudioInserter\dsfOggRawAudioInserter.vcproj", "{EEEBA51F-0499-4AD0-A25C-36C3AF2956C9}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggRawAudioExtractor", "..\..\src\lib\codecs\RawAudio\dsfOggRawAudioExtractor\dsfOggRawAudioExtractor.vcproj", "{20DC77C5-8396-4C6D-A805-959CF8DFABB3}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnTransmoggrify", "..\..\src\tools\UnTransmoggrify\UnTransmoggrify.vcproj", "{FC1E2E69-3FE9-4DC6-9897-4F0329EB24D7}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{91398E15-B997-42E3-9057-8A557729B2A7}"
@@ -1081,20 +1082,20 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testOOSpeexDec", "..\..\src\tests\testOOSpeexDec\testOOSpeexDec.vcproj", "{E3F4D087-0166-484D-BA2C-BB183BA1BFAD}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{6D653C6F-8722-4B10-9C3A-CB7094DD159F} = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
+		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
-		{6D653C6F-8722-4B10-9C3A-CB7094DD159F} = {6D653C6F-8722-4B10-9C3A-CB7094DD159F}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOVorbis", "..\..\src\lib\codecs\vorbis\libs\libOOVorbis\libOOVorbis.vcproj", "{C97A67F9-B786-41FA-9FC9-13167FE2BA49}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testOOVorbisDec", "..\..\src\tests\testOOVorbisDec\testOOVorbisDec.vcproj", "{CF22157B-87DD-4B14-84A6-1DAA760A134C}"
 	ProjectSection(ProjectDependencies) = postProject
+		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468} = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2} = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTremor", "..\..\src\lib\codecs\vorbis\libs\libOOTremor\libOOTremor.vcproj", "{620C8CE0-D182-4C0E-B83E-05656ECA971B}"
@@ -1103,9 +1104,9 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testOOTremorDec", "..\..\src\tests\testOOTremorDec\testOOTremorDec.vcproj", "{6D079A10-94A1-4EEC-8E4F-22F865AD47C1}"
 	ProjectSection(ProjectDependencies) = postProject
+		{620C8CE0-D182-4C0E-B83E-05656ECA971B} = {620C8CE0-D182-4C0E-B83E-05656ECA971B}
+		{7A8E774E-DD94-43B8-8758-6F9F656CC8D2} = {7A8E774E-DD94-43B8-8758-6F9F656CC8D2}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{7A8E774E-DD94-43B8-8758-6F9F656CC8D2} = {7A8E774E-DD94-43B8-8758-6F9F656CC8D2}
-		{620C8CE0-D182-4C0E-B83E-05656ECA971B} = {620C8CE0-D182-4C0E-B83E-05656ECA971B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora-exp_dec", "..\..\src\lib\codecs\theora\libs\libtheora-exp\win32\VS2005\libtheora-exp_dec\libtheora-exp_dec.vcproj", "{A95E7EE6-21EB-4D62-A26F-95A2F5F069C5}"

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.cpp	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.cpp	2006-10-10 10:12:24 UTC (rev 11896)
@@ -1,5 +1,5 @@
 //===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//Copyright (C) 2003-2006 Zentaro Kavanagh
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.h	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeFilter.h	2006-10-10 10:12:24 UTC (rev 11896)
@@ -1,5 +1,5 @@
 //===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//Copyright (C) 2003-2006 Zentaro Kavanagh
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions
@@ -58,7 +58,6 @@
 	//COM Creator function
 	static CUnknown* WINAPI SpeexEncodeFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
 
-
 protected:
 	//Implementation of pure virtual from AbstractTransformFilter.
 	virtual bool ConstructPins();

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp	2006-10-10 10:12:24 UTC (rev 11896)
@@ -1,5 +1,5 @@
 //===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//Copyright (C) 2003-2006 Zentaro Kavanagh
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions
@@ -32,149 +32,89 @@
 #include "stdafx.h"
 #include "SpeexEncodeInputPin.h"
 
-SpeexEncodeInputPin::SpeexEncodeInputPin(AbstractTransformFilter* inParentFilter, CCritSec* inFilterLock, AbstractTransformOutputPin* inOutputPin, vector<CMediaType*> inAcceptableMediaTypes)
-	:	AbstractTransformInputPin(inParentFilter, inFilterLock, inOutputPin, NAME("SpeexEncodeInputPin"), L"PCM In", inAcceptableMediaTypes)
-	,	mFishSound(NULL)
+SpeexEncodeInputPin::SpeexEncodeInputPin(       AbstractTransformFilter* inParentFilter
+                                            ,   CCritSec* inFilterLock
+                                            ,   AbstractTransformOutputPin* inOutputPin
+                                            ,   vector<CMediaType*> inAcceptableMediaTypes)
+	:	AbstractTransformInputPin(      inParentFilter
+                                    ,   inFilterLock
+                                    ,   inOutputPin
+                                    ,   NAME("SpeexEncodeInputPin")
+                                    ,   L"PCM In"
+                                    ,   inAcceptableMediaTypes)
 	,	mWaveFormat(NULL)
-
+    ,   mBegun(false)
 	,	mUptoFrame(0)
 {
-	//debugLog.open("C:\\temp\\speexenc.log", ios_base::out);
+
 }
 
 SpeexEncodeInputPin::~SpeexEncodeInputPin(void)
 {
-	//debugLog.close();
 	DestroyCodec();
 }
 
+HRESULT SpeexEncodeInputPin::TransformData(unsigned char* inBuf, long inNumBytes) 
+{
+    HRESULT locHR = S_OK;
+    vector<StampedOggPacket*> locPackets;
+    if (!mBegun) {
+        locPackets = mSpeexEncoder.setupCodec(mEncoderSettings);
+        
+        //What to do about this?
 
-//PURE VIRTUALS
-HRESULT SpeexEncodeInputPin::TransformData(unsigned char* inBuf, long inNumBytes) {
+        //if (locPackets.size() != VorbisEncoder::NUM_VORBIS_HEADERS) {
+        //    //Is this really what we want to return?
+        //    return E_FAIL;
+        //}
 
-	//TODO::: There is a problem when we get 8 bit samples.
-	//=====================================================
-	//debugLog << "encodeData receives : "<<inNumBytes<<" bytes"<<endl;
-	
 
-	//************************************ Check this line... the +(inNumBytes%2) is new
-	//Note the 2 is because a float is twice the width of a short.
-	float* locFloatBuf = new float[inNumBytes/2];   // + (inNumBytes % 2)];
-	//************************************ 
-	short locTempShort = 0;
-	float locTempFloat = 0;
+        locHR = sendPackets(locPackets);
+        deletePacketsAndEmptyVector(locPackets);
+        if (locHR != S_OK) {
+            return locHR;
+        }
+        mBegun = true;
+    }
 
+    unsigned long locNumSamplesPerChannel = bufferBytesToSampleCount(inNumBytes);
+    locPackets = mSpeexEncoder.encode((const short* const)inBuf, locNumSamplesPerChannel);
 
-	for (int i = 0; i < inNumBytes; i += 2) {
-		locTempShort = *((short*)(inBuf + i));
-		locTempFloat = (float)locTempShort;
-		locTempFloat /= 32767.0;
-		locFloatBuf[i/2] = locTempFloat;;
-	}
-	//debugLog<<"Calling encode"<<endl;
-	//FIX::: The 2 is the size of a sample ie 16 bits
-	long locErr = fish_sound_encode(mFishSound, (float**)locFloatBuf, inNumBytes/(mFishInfo.channels*2));
-	delete[] locFloatBuf;
-	//FIX::: Do something here ?
-	if (locErr < 0) {
-		//debugLog<<"Fishsound reports error"<<endl;
-	} else {
-	
-	}
-	return S_OK;
+    locHR = sendPackets(locPackets);
+    deletePacketsAndEmptyVector(locPackets);
+    return locHR;
+
 }
-bool SpeexEncodeInputPin::ConstructCodec() {
-	mFishInfo.channels = mWaveFormat->nChannels;
-	mFishInfo.format = FISH_SOUND_SPEEX;
-	mFishInfo.samplerate = mWaveFormat->nSamplesPerSec;
+bool SpeexEncodeInputPin::ConstructCodec() 
+{
 
-	//Change to fill in vorbis format block so muxer can work
 	((SpeexEncodeFilter*)mParentFilter)->mSpeexFormatBlock.numChannels = mWaveFormat->nChannels;
 	((SpeexEncodeFilter*)mParentFilter)->mSpeexFormatBlock.samplesPerSec = mWaveFormat->nSamplesPerSec;
-	
-	//
-	
-	mFishSound = fish_sound_new (FISH_SOUND_ENCODE, &mFishInfo);
 
-	int i = 1;
-	//FIX::: Use new API for interleave setting
-	fish_sound_command(mFishSound, FISH_SOUND_SET_INTERLEAVE, &i, sizeof(int));
+    mEncoderSettings.setAudioParameters(mWaveFormat->nSamplesPerSec, mWaveFormat->nChannels);
 
-	fish_sound_set_encoded_callback (mFishSound, SpeexEncodeInputPin::SpeexEncoded, this);
-	//FIX::: Proper return value
-	return true;
-
+    return true;
 }
-void SpeexEncodeInputPin::DestroyCodec() {
-	fish_sound_delete(mFishSound);
-	mFishSound = NULL;
-}
 
-
-//Encoded callback
-int SpeexEncodeInputPin::SpeexEncoded (FishSound* inFishSound, unsigned char* inPacketData, long inNumBytes, void* inThisPointer) 
+void SpeexEncodeInputPin::DestroyCodec() 
 {
 
+}
 
-	SpeexEncodeInputPin* locThis = reinterpret_cast<SpeexEncodeInputPin*> (inThisPointer);
-	SpeexEncodeFilter* locFilter = reinterpret_cast<SpeexEncodeFilter*>(locThis->m_pFilter);
-	//locThis->debugLog << "SpeexEncoded called with "<<inNumBytes<< " byte of data"<<endl;
+HRESULT SpeexEncodeInputPin::EndOfStream()
+{
+    CAutoLock locLock(mStreamLock);
 
-	//Time stamps are granule pos not directshow times
-	LONGLONG locFrameStart = locThis->mUptoFrame;
-	LONGLONG locFrameEnd	= locThis->mUptoFrame
-							= fish_sound_get_frameno(locThis->mFishSound);
+    //TODO:::!!
 
-	
-	//locThis->debugLog << "Stamping packet "<<locFrameStart<< " to "<<locFrameEnd<<endl;
-	//Get a pointer to a new sample stamped with our time
-	IMediaSample* locSample;
-	HRESULT locHR = locThis->mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
+    //vector<StampedOggPacket*> locPackets = mSpeexEncoder.flush();
 
-	if (FAILED(locHR)) {
-		//We get here when the application goes into stop mode usually.
-		//locThis->debugLog<<"Getting buffer failed"<<endl;
-		return locHR;
-	}	
-	
-	BYTE* locBuffer = NULL;
+    //HRESULT locHR = sendPackets(locPackets);
+    //deletePacketsAndEmptyVector(locPackets);
+    return AbstractTransformInputPin::EndOfStream();
 
-	
-	//Make our pointers set to point to the samples buffer
-	locSample->GetPointer(&locBuffer);
-
-	
-
-	if (locSample->GetSize() >= inNumBytes) {
-
-		memcpy((void*)locBuffer, (const void*)inPacketData, inNumBytes);
-		
-		//Set the sample parameters.
-		locThis->SetSampleParams(locSample, inNumBytes, &locFrameStart, &locFrameEnd);
-
-		{
-			CAutoLock locLock(locThis->m_pLock);
-
-			//Add a reference so it isn't deleted en route.
-			//locSample->AddRef();
-			//NO - It alrady has a ref on it.
-
-			//TODO::: Need to propagate error states.
-			HRESULT locHR = ((SpeexEncodeOutputPin*)(locThis->mOutputPin))->mDataQueue->Receive(locSample);						//->DownstreamFilter()->Receive(locSample);
-			if (locHR != S_OK) {
-				//locThis->debugLog<<"Sample rejected"<<endl;
-			} else {
-				//locThis->debugLog<<"Sample Delivered"<<endl;
-			}
-		}
-
-		return 0;
-	} else {
-		throw 0;
-	}
 }
 
-
 HRESULT SpeexEncodeInputPin::SetMediaType(const CMediaType* inMediaType) 
 {
 	
@@ -187,13 +127,72 @@
 		//Failed... should never be here !
 		throw 0;
 	}
-	//This is here and not the constructor because we need audio params from the
-	// input pin to construct properly.	
 	
 	ConstructCodec();
 
 	return CBaseInputPin::SetMediaType(inMediaType);
 
-	
-	
+}
+
+
+void SpeexEncodeInputPin::deletePacketsAndEmptyVector(vector<StampedOggPacket*>& inPackets)
+{
+    for (size_t i = 0; i < inPackets.size(); i++) {
+        delete inPackets[i];
+    }
+    inPackets.clear();
+}
+
+unsigned long SpeexEncodeInputPin::bufferBytesToSampleCount(long inByteCount)
+{
+    if (mEncoderSettings.numChannels() == 0) {
+        return 0;
+    }
+    //TODO::: Needs a bytes per sample thingy
+    const long SIZE_OF_SHORT = sizeof(short);
+    return (inByteCount / mEncoderSettings.numChannels()) / SIZE_OF_SHORT;
+}
+
+HRESULT SpeexEncodeInputPin::sendPackets(const vector<StampedOggPacket*>& inPackets)
+{
+  
+	LONGLONG locFrameStart;
+    LONGLONG locFrameEnd;
+    IMediaSample* locSample = NULL;
+    BYTE* locBuffer = NULL;
+
+    for (size_t pack = 0; pack < inPackets.size(); pack++) {
+        locFrameStart = mUptoFrame;
+        locFrameEnd = inPackets[pack]->endTime();
+        mUptoFrame = locFrameEnd;
+
+        HRESULT locHR = mOutputPin->GetDeliveryBuffer(     &locSample
+                                                        ,   &locFrameStart
+                                                        ,   &locFrameEnd
+                                                        ,   NULL);
+        if (FAILED(locHR)) {
+		    //We get here when the application goes into stop mode usually.
+		    return locHR;
+	    }	
+
+        //TODO::: Should we be checking this return?
+        locSample->GetPointer(&locBuffer);
+
+	    if (locSample->GetSize() >= inPackets[pack]->packetSize()) {
+		    memcpy((void*)locBuffer, (const void*)inPackets[pack]->packetData(), inPackets[pack]->packetSize());
+    		
+		    //Set the sample parameters.
+		    SetSampleParams(locSample, inPackets[pack]->packetSize(), &locFrameStart, &locFrameEnd);
+
+		    locHR = ((SpeexEncodeOutputPin*)mOutputPin)->mDataQueue->Receive(locSample);
+            if (locHR != S_OK) {
+                return locHR;
+            }
+
+	    } else {
+		    throw 0;
+	    }
+    }
+
+    return S_OK;
 }
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h	2006-10-10 10:12:24 UTC (rev 11896)
@@ -1,5 +1,5 @@
 //===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//Copyright (C) 2003-2006 Zentaro Kavanagh
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions
@@ -31,44 +31,41 @@
 
 #pragma once
 
-
 #include "AbstractTransformInputPin.h"
 #include "SpeexEncodeInputPin.h"
-
 #include "SpeexEncodeFilter.h"
+#include "SpeexEncoder.h"
+#include "SpeexEncodeSettings.h"
 
-extern "C" {
-//#include <fishsound/fishsound.h>
-#include "fish_cdecl.h"
-}
-
-//#include <fstream>
-//using namespace std;
 class SpeexEncodeInputPin
 	:	public AbstractTransformInputPin
 {
 public:
-	SpeexEncodeInputPin(AbstractTransformFilter* inFilter, CCritSec* inFilterLock, AbstractTransformOutputPin* inOutputPin, vector<CMediaType*> inAcceptableMediaTypes);
+	SpeexEncodeInputPin(        AbstractTransformFilter* inFilter
+                            ,   CCritSec* inFilterLock
+                            ,   AbstractTransformOutputPin* inOutputPin
+                            ,   vector<CMediaType*> inAcceptableMediaTypes);
 	virtual ~SpeexEncodeInputPin(void);
 
-	static int __cdecl SpeexEncodeInputPin::SpeexEncoded (FishSound* inFishSound, unsigned char* inPacketData, long inNumBytes, void* inThisPointer) ;
-	
 	virtual HRESULT SetMediaType(const CMediaType* inMediaType);
+    virtual STDMETHODIMP EndOfStream();
 
 protected:
-	HRESULT mHR;
-//PURE VIRTUALS
 	virtual HRESULT TransformData(unsigned char* inBuf, long inNumBytes);
 	virtual bool ConstructCodec();
 	virtual void DestroyCodec();
 
+    void deletePacketsAndEmptyVector(vector<StampedOggPacket*>& inPackets);
+    HRESULT sendPackets(const vector<StampedOggPacket*>& inPackets);
+    unsigned long bufferBytesToSampleCount(long inByteCount);
 
+
 	WAVEFORMATEX* mWaveFormat;
 	__int64 mUptoFrame;
+    bool mBegun;
 
-	//fstream debugLog;
-	FishSound* mFishSound;
-	FishSoundInfo mFishInfo; 
+    SpeexEncoder mSpeexEncoder;
+    SpeexEncodeSettings mEncoderSettings;
 
-	
+
 };

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeOutputPin.cpp	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeOutputPin.cpp	2006-10-10 10:12:24 UTC (rev 11896)
@@ -1,5 +1,5 @@
 //===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//Copyright (C) 2003-2006 Zentaro Kavanagh
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions
@@ -32,8 +32,16 @@
 #include "stdafx.h"
 #include "Speexencodeoutputpin.h"
 
-SpeexEncodeOutputPin::SpeexEncodeOutputPin(SpeexEncodeFilter* inParentFilter,CCritSec* inFilterLock, vector<CMediaType*> inAcceptableMediaTypes)
-	:	AbstractTransformOutputPin(inParentFilter, inFilterLock,NAME("SpeexDecodeOutputPin"), L"Speex Out", 65536, 5, inAcceptableMediaTypes)
+SpeexEncodeOutputPin::SpeexEncodeOutputPin(     SpeexEncodeFilter* inParentFilter
+                                            ,   CCritSec* inFilterLock
+                                            ,   vector<CMediaType*> inAcceptableMediaTypes)
+	:	AbstractTransformOutputPin(     inParentFilter
+                                    ,   inFilterLock
+                                    ,   NAME("SpeexDecodeOutputPin")
+                                    ,   L"Speex Out"
+                                    ,   65536
+                                    ,   5
+                                    ,   inAcceptableMediaTypes)
 {
 }
 
@@ -53,11 +61,4 @@
         return S_FALSE;
 	}
 }
-//bool SpeexEncodeOutputPin::FillFormatBuffer(BYTE* inFormatBuffer) {
-//	SpeexEncodeFilter* locParentFilter = (SpeexEncodeFilter*)mParentFilter;
-//	memcpy((void*)inFormatBuffer, (const void*) &(locParentFilter->mSpeexFormatBlock), sizeof(sSpeexFormatBlock));
-//	return true;
-//}
-//unsigned long SpeexEncodeOutputPin::FormatBufferSize() {
-//	return sizeof(sSpeexFormatBlock);
-//}
+

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeOutputPin.h	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeOutputPin.h	2006-10-10 10:12:24 UTC (rev 11896)
@@ -1,5 +1,5 @@
 //===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//Copyright (C) 2003-2006 Zentaro Kavanagh
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions
@@ -31,26 +31,22 @@
 
 #pragma once
 
-//Local Includes
 #include "Speexencoderdllstuff.h"
 
-//External Includes
 #include "AbstractTransformOutputPin.h"
 
-//Forward Declarations
 class SpeexEncodeFilter;
 struct sSpeexFormatBlock;
 
 class SpeexEncodeOutputPin
-	//Base Classes
 	:	public	AbstractTransformOutputPin
 {
 public:
-	//Friend Classes
 	friend class SpeexEncodeInputPin;
 
-	//Constructors
-	SpeexEncodeOutputPin(SpeexEncodeFilter* inParentFilter, CCritSec* inFilterLock, vector<CMediaType*> inAcceptableMediaTypes);
+	SpeexEncodeOutputPin(       SpeexEncodeFilter* inParentFilter
+                            ,   CCritSec* inFilterLock
+                            ,   vector<CMediaType*> inAcceptableMediaTypes);
 	virtual ~SpeexEncodeOutputPin(void);
 
 protected:

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/dsfSpeexEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/dsfSpeexEncoder.vcproj	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/dsfSpeexEncoder.vcproj	2006-10-10 10:12:24 UTC (rev 11896)
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
+				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libOOSpeex;..\..\..\..\helper;..\..\libs\libspeex\include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -187,12 +187,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -208,18 +209,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libOOSpeex;..\..\..\..\helper;..\..\libs\libspeex\include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="0"
+				CallingConvention="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -232,45 +239,48 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib unicows.lib"
 				OutputFile="$(OutDir)/dsfSpeexEncoder.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="speexencoder.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/dsfSpeexEncoder.pdb"
 				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
 				ImportLibrary="$(OutDir)/dsfSpeexEncoder.lib"
-				TargetMachine="0"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCAppVerifierTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
+			<Tool
+				Name="VCWebDeploymentTool"
 			/>
-			<DebuggerTool
+			<Tool
+				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			Name="Release|Pocket PC 2003 (ARMV4)"
+			OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -290,14 +300,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
 				StringPooling="true"
@@ -305,9 +316,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"
-				CallingConvention="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -320,7 +329,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib unicows.lib"
+				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
 				OutputFile="$(OutDir)/dsfSpeexEncoder.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -331,41 +340,39 @@
 				EnableCOMDATFolding="2"
 				OptimizeForWindows98="1"
 				ImportLibrary="$(OutDir)/dsfSpeexEncoder.lib"
-				TargetMachine="1"
+				TargetMachine="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCPostBuildEventTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+			<DebuggerTool
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+			Name="Debug_CE_ARM|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -381,23 +388,20 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libOOSpeex;..\..\..\..\helper;..\..\libs\libspeex\include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
-				DebugInformationFormat="0"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CallingConvention="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -412,49 +416,47 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
 				OutputFile="$(OutDir)/dsfSpeexEncoder.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="speexencoder.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/dsfSpeexEncoder.pdb"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				ImportLibrary="$(OutDir)/dsfSpeexEncoder.lib"
-				TargetMachine="0"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCAppVerifierTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
+			<Tool
+				Name="VCWebDeploymentTool"
 			/>
-			<DebuggerTool
+			<Tool
+				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+			Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+			OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -475,18 +477,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
+				MinimalRebuild="true"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
-				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -501,14 +498,12 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
 				OutputFile="$(OutDir)/dsfSpeexEncoder.dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="speexencoder.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/dsfSpeexEncoder.pdb"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				ImportLibrary="$(OutDir)/dsfSpeexEncoder.lib"
 				TargetMachine="0"
 			/>
@@ -537,7 +532,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug_CE_ARM|Win32"
+			Name="Debug_WM5_PPC_ARM|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
@@ -562,7 +557,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
+				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libOOSpeex;..\..\..\..\helper;..\..\libs\libspeex\include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -621,7 +616,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+			Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
 			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -702,9 +697,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+			Name="Release_WM5_PPC_ARM|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -723,18 +718,20 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
+				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libOOSpeex;..\..\..\..\helper;..\..\libs\libspeex\include"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
 				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CallingConvention="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -756,36 +753,37 @@
 				ProgramDatabaseFile="$(OutDir)/dsfSpeexEncoder.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/dsfSpeexEncoder.lib"
-				TargetMachine="0"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCCodeSignTool"
+				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCAppVerifierTool"
 			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
+			<Tool
+				Name="VCWebDeploymentTool"
 			/>
-			<DebuggerTool
+			<Tool
+				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug_WM5_PPC_ARM|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+			OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -804,20 +802,18 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CallingConvention="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -839,37 +835,36 @@
 				ProgramDatabaseFile="$(OutDir)/dsfSpeexEncoder.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/dsfSpeexEncoder.lib"
-				TargetMachine="1"
+				TargetMachine="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCPostBuildEventTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+			<DebuggerTool
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -948,12 +943,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
 			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -974,13 +970,18 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -995,12 +996,14 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
 				OutputFile="$(OutDir)/dsfSpeexEncoder.dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile="speexencoder.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/dsfSpeexEncoder.pdb"
 				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
 				ImportLibrary="$(OutDir)/dsfSpeexEncoder.lib"
 				TargetMachine="0"
 			/>
@@ -1029,9 +1032,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release_WM5_PPC_ARM|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -1050,20 +1053,18 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXENCODER_EXPORTS"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CallingConvention="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1085,37 +1086,36 @@
 				ProgramDatabaseFile="$(OutDir)/dsfSpeexEncoder.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/dsfSpeexEncoder.lib"
-				TargetMachine="1"
+				TargetMachine="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCPostBuildEventTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
 			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+			<DebuggerTool
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
-			OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
-			IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+			Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="1"
@@ -1322,7 +1322,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1330,7 +1330,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|Pocket PC 2003 (ARMV4)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1338,7 +1338,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
+					Name="Debug_CE_ARM|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1346,7 +1346,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1354,7 +1354,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug_CE_ARM|Win32"
+					Name="Debug_WM5_PPC_ARM|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1362,7 +1362,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+					Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1370,7 +1370,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release_WM5_PPC_ARM|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1378,7 +1378,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug_WM5_PPC_ARM|Win32"
+					Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1386,7 +1386,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1394,7 +1394,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1402,7 +1402,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release_WM5_PPC_ARM|Win32"
+					Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1410,7 +1410,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+					Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 					>
 					<Tool
 						Name="VCCLCompilerTool"

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.h	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.h	2006-10-10 10:12:24 UTC (rev 11896)
@@ -1,5 +1,5 @@
 //===========================================================================
-//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//Copyright (C) 2003-2006 Zentaro Kavanagh
 //
 //Redistribution and use in source and binary forms, with or without
 //modification, are permitted provided that the following conditions

Modified: trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncodeSettings.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncodeSettings.cpp	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncodeSettings.cpp	2006-10-10 10:12:24 UTC (rev 11896)
@@ -9,7 +9,11 @@
     ,   mBitrate(-1)
     ,   mVBRMaxBitrate(-1)
     ,   mFramesPerPacket(1)
-    ,   mBitrateControlMode(SPEEX_BITRATE_VBR_QUALITY)
+    ,   mUsingDTX(false)
+    ,   mUsingDenoise(false)
+    ,   mUsingAGC(false)
+    ,   mUsingVAD(false)
+    ,   mBitrateControlMode(SPEEX_BITRATE_CBR_QUALITY)
     ,   mEncodingMode(SPEEX_ENCODE_NO_MODE_SET)
 {
 }
@@ -27,6 +31,7 @@
 
         mSampleRate = inSampleRate;
         mNumChannels = inNumChannels;
+        setMode(SPEEX_ENCODE_NO_MODE_SET);
         return true;
     }
     return false;

Modified: trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.cpp	2006-10-10 04:59:58 UTC (rev 11895)
+++ trunk/oggdsf/src/lib/codecs/speex/libs/libOOSpeex/SpeexEncoder.cpp	2006-10-10 10:12:24 UTC (rev 11896)
@@ -21,7 +21,7 @@
 string SpeexEncoder::getVendorString()
 {
     char* locVersionBuf = NULL;
-    speex_encoder_ctl(mSpeexState, SPEEX_LIB_GET_VERSION_STRING, &locVersionBuf);
+    speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, &locVersionBuf);
     string locVersionString(locVersionBuf);
     string retString = string("Encoded with Speex ") + locVersionString;
     return retString;
@@ -39,8 +39,8 @@
     speex_init_header(&locLibSpeexHeader, inSettings.sampleRate(), inSettings.numChannels(), locLibSpeexMode);
     locLibSpeexHeader.frames_per_packet = inSettings.framesPerPacket();
 
-    if (        (inSettings.encodingMode() == SpeexEncodeSettings::SPEEX_BITRATE_VBR_BITRATE)
-           ||  (inSettings.encodingMode() == SpeexEncodeSettings::SPEEX_BITRATE_VBR_QUALITY)) {
+    if (        (inSettings.bitrateControlMode() == SpeexEncodeSettings::SPEEX_BITRATE_VBR_BITRATE)
+        ||  (inSettings.bitrateControlMode() == SpeexEncodeSettings::SPEEX_BITRATE_VBR_QUALITY)) {
         locLibSpeexHeader.vbr = 1;
     }
 



More information about the commits mailing list