FS-11061: [core] fix build with newer pcre

This reverts commit 5d4ee9a851.

.gitattributes

@@ -17,6 +17,8 @@
 *.min.js -diff binary minified
 *-min.js -diff binary minified
 *.min.css -diff binary minified
+.git* debian-ignore
+gbp.conf debian-ignore
 /clients/flex* dfsg-nonfree
 /debian* debian-ignore
 /freeswitch.xcodeproj debian-ignore

.gitignore

@@ -231,3 +231,21 @@ yum/temp
 html5/verto/verto_communicator/bower_components/
 html5/verto/verto_communicator/node_modules/
 .vs/
+
+Freeswitch.2015.VC.db
+Freeswitch.2015.VC.VC.opendb
+libs/freetype/
+libs/libpng/
+libs/zlib/
+
+libs/libav/
+libs/libx264/
+
+Win32/*.msi
+x64/*.msi
+
+libs/tiff-4.0.7/
+libs/PaxHeaders.1693/
+
+libs/lua-*/
+

Freeswitch.2015.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}"
 EndProject
@@ -395,8 +395,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libs\win32\s
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\ilbc\libilbc.2015.vcxproj", "{9A5DDF08-C88C-4A35-B7F6-D605228446BD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "src\mod\languages\mod_lua\lua\lua.2015.vcxproj", "{D0B36172-CD76-454A-9B89-990025266C2A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opal", "src\mod\endpoints\mod_opal\mod_opal.2015.vcxproj", "{05C9FB27-480E-4D53-B3B7-6338E2526666}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skinny", "src\mod\endpoints\mod_skinny\mod_skinny.2015.vcxproj", "{CC1DD008-9406-448D-A0AD-33C3186CFADB}"
@@ -606,6 +604,53 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rtc", "src\mod\endpoint
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_verto", "src\mod\endpoints\mod_verto\mod_verto.2015.vcxproj", "{5B2BACE4-0F5A-4A21-930D-C0F4B1F58FA6}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyuv", "libs\win32\libyuv\libyuv.2015.vcxproj", "{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvpx", "libs\win32\libvpx\libvpx.2015.vcxproj", "{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "libs\win32\zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311} = {CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libs\win32\libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33} = {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download zlib", "libs\win32\Download zlib.2015.vcxproj", "{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libpng", "libs\win32\Download libpng.2015.vcxproj", "{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "libs\win32\freetype\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A} = {0AD87FDA-989F-4638-B6E1-B0132BB0560A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download freetype", "libs\win32\Download freetype.2015.vcxproj", "{0AD87FDA-989F-4638-B6E1-B0132BB0560A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_png", "src\mod\formats\mod_png\mod_png.2015.vcxproj", "{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libav", "libs\win32\Download libav.2015.vcxproj", "{77C9E0A2-177D-4BD6-9EFD-75A56F886325}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libav", "libs\win32\libav\libav.2015.vcxproj", "{841C345F-FCC7-4F64-8F54-0281CEABEB01}"
+	ProjectSection(ProjectDependencies) = postProject
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325} = {77C9E0A2-177D-4BD6-9EFD-75A56F886325}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_av", "src\mod\applications\mod_av\mod_av.2015.vcxproj", "{7AEE504B-23B6-4B05-829E-7CD34855F146}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libx264", "libs\win32\libx264\libx264.2015.vcxproj", "{20179127-853B-4FE9-B7C0-9E817E6A3A72}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libx264", "libs\win32\Download libx264.2015.vcxproj", "{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_http_cache", "src\mod\applications\mod_http_cache\mod_http_cache.vcxproj", "{87933C2D-0159-46F7-B326-E1B6E982C21E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua52", "libs\win32\lua\lua.2015.vcxproj", "{4F990563-6DFB-45C3-B083-1938C6D7FFA4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download lua", "libs\win32\Download lua.2015.vcxproj", "{45CD36EE-0AF3-4387-8790-4F11E928299D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -1300,6 +1345,7 @@ Global
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.ActiveCfg = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|x64.Build.0 = Release|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|Win32.Build.0 = Debug|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|x64.ActiveCfg = Debug|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Debug|x64.Build.0 = Debug|x64
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.ActiveCfg = Release|Win32
@@ -1746,17 +1792,6 @@ Global
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|Win32.Build.0 = Release|Win32
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|x64.ActiveCfg = Release|x64
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|x64.Build.0 = Release|x64
-		{D0B36172-CD76-454A-9B89-990025266C2A}.All|Win32.ActiveCfg = Release|x64
-		{D0B36172-CD76-454A-9B89-990025266C2A}.All|x64.ActiveCfg = Release|x64
-		{D0B36172-CD76-454A-9B89-990025266C2A}.All|x64.Build.0 = Release|x64
-		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|Win32.Build.0 = Debug|Win32
-		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|x64.ActiveCfg = Debug|x64
-		{D0B36172-CD76-454A-9B89-990025266C2A}.Debug|x64.Build.0 = Debug|x64
-		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|Win32.ActiveCfg = Release|Win32
-		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|Win32.Build.0 = Release|Win32
-		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|x64.ActiveCfg = Release|x64
-		{D0B36172-CD76-454A-9B89-990025266C2A}.Release|x64.Build.0 = Release|x64
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|Win32.ActiveCfg = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|Win32.Build.0 = Release|Win32
 		{05C9FB27-480E-4D53-B3B7-6338E2526666}.All|x64.ActiveCfg = Release|Win32
@@ -2686,6 +2721,218 @@ Global
 		{5B2BACE4-0F5A-4A21-930D-C0F4B1F58FA6}.Release|Win32.Build.0 = Release|Win32
 		{5B2BACE4-0F5A-4A21-930D-C0F4B1F58FA6}.Release|x64.ActiveCfg = Release|x64
 		{5B2BACE4-0F5A-4A21-930D-C0F4B1F58FA6}.Release|x64.Build.0 = Release|x64
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.All|Win32.ActiveCfg = Release|Win32
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.All|Win32.Build.0 = Release|Win32
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.All|x64.ActiveCfg = Release|x64
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.All|x64.Build.0 = Release|x64
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.Debug|Win32.Build.0 = Debug|Win32
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.Debug|x64.ActiveCfg = Debug|x64
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.Debug|x64.Build.0 = Debug|x64
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.Release|Win32.ActiveCfg = Release|Win32
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.Release|Win32.Build.0 = Release|Win32
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.Release|x64.ActiveCfg = Release|x64
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}.Release|x64.Build.0 = Release|x64
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.All|Win32.ActiveCfg = Release|Win32
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.All|Win32.Build.0 = Release|Win32
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.All|x64.ActiveCfg = Release|x64
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.All|x64.Build.0 = Release|x64
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|Win32.Build.0 = Debug|Win32
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|x64.ActiveCfg = Debug|x64
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Debug|x64.Build.0 = Debug|x64
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Win32.ActiveCfg = Release|Win32
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Win32.Build.0 = Release|Win32
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|x64.ActiveCfg = Release|x64
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|x64.Build.0 = Release|x64
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.All|Win32.ActiveCfg = Release|Win32
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.All|Win32.Build.0 = Release|Win32
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.All|x64.ActiveCfg = Release|x64
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.All|x64.Build.0 = Release|x64
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.ActiveCfg = Debug|x64
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.Build.0 = Debug|x64
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.ActiveCfg = Release|x64
+		{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.Build.0 = Release|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.All|Win32.ActiveCfg = Release|Win32
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.All|Win32.Build.0 = Release|Win32
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.All|x64.ActiveCfg = Release|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.All|x64.Build.0 = Release|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|x64
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release|x64
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.All|Win32.ActiveCfg = Release|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.All|Win32.Build.0 = Release|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.All|x64.ActiveCfg = Release|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.All|x64.Build.0 = Release|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Debug|Win32.Build.0 = Debug|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Debug|x64.ActiveCfg = Debug|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Debug|x64.Build.0 = Debug|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Release|Win32.ActiveCfg = Release|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Release|Win32.Build.0 = Release|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Release|x64.ActiveCfg = Release|Win32
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Release|x64.Build.0 = Release|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|Win32.ActiveCfg = Release|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|Win32.Build.0 = Release|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|x64.ActiveCfg = Release|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|x64.Build.0 = Release|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Debug|Win32.Build.0 = Debug|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Debug|x64.ActiveCfg = Debug|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Debug|x64.Build.0 = Debug|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Release|Win32.ActiveCfg = Release|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Release|Win32.Build.0 = Release|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Release|x64.ActiveCfg = Release|Win32
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Release|x64.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|Win32.ActiveCfg = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|Win32.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|x64.Build.0 = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.All|Win32.ActiveCfg = Release|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.All|Win32.Build.0 = Release|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.All|x64.ActiveCfg = Release|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.All|x64.Build.0 = Release|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Debug|Win32.Build.0 = Debug|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Debug|x64.ActiveCfg = Debug|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Debug|x64.Build.0 = Debug|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Release|Win32.ActiveCfg = Release|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Release|Win32.Build.0 = Release|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Release|x64.ActiveCfg = Release|Win32
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Release|x64.Build.0 = Release|Win32
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.All|Win32.ActiveCfg = Release|Win32
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.All|Win32.Build.0 = Release|Win32
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.All|x64.ActiveCfg = Release|x64
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.All|x64.Build.0 = Release|x64
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Debug|Win32.Build.0 = Debug|Win32
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Debug|x64.ActiveCfg = Debug|x64
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Debug|x64.Build.0 = Debug|x64
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Release|Win32.ActiveCfg = Release|Win32
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Release|Win32.Build.0 = Release|Win32
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Release|x64.ActiveCfg = Release|x64
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Release|x64.Build.0 = Release|x64
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.All|Win32.ActiveCfg = Release|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.All|Win32.Build.0 = Release|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.All|x64.ActiveCfg = Release|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.All|x64.Build.0 = Release|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Debug|Win32.ActiveCfg = Debug|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Debug|Win32.Build.0 = Debug|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Debug|x64.ActiveCfg = Debug|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Debug|x64.Build.0 = Debug|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Release|Win32.ActiveCfg = Release|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Release|Win32.Build.0 = Release|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Release|x64.ActiveCfg = Release|Win32
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Release|x64.Build.0 = Release|Win32
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.All|Win32.ActiveCfg = Release|Win32
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.All|Win32.Build.0 = Release|Win32
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.All|x64.ActiveCfg = Release|x64
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.All|x64.Build.0 = Release|x64
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.Debug|Win32.ActiveCfg = Debug|Win32
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.Debug|Win32.Build.0 = Debug|Win32
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.Debug|x64.ActiveCfg = Debug|x64
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.Debug|x64.Build.0 = Debug|x64
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.Release|Win32.ActiveCfg = Release|Win32
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.Release|Win32.Build.0 = Release|Win32
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.Release|x64.ActiveCfg = Release|x64
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01}.Release|x64.Build.0 = Release|x64
+		{7AEE504B-23B6-4B05-829E-7CD34855F146}.All|Win32.ActiveCfg = Release|Win32
+		{7AEE504B-23B6-4B05-829E-7CD34855F146}.All|Win32.Build.0 = Release|Win32
+		{7AEE504B-23B6-4B05-829E-7CD34855F146}.All|x64.ActiveCfg = Release|x64
+		{7AEE504B-23B6-4B05-829E-7CD34855F146}.All|x64.Build.0 = Release|x64
+		{7AEE504B-23B6-4B05-829E-7CD34855F146}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7AEE504B-23B6-4B05-829E-7CD34855F146}.Debug|x64.ActiveCfg = Debug|x64
+		{7AEE504B-23B6-4B05-829E-7CD34855F146}.Release|Win32.ActiveCfg = Release|Win32
+		{7AEE504B-23B6-4B05-829E-7CD34855F146}.Release|x64.ActiveCfg = Release|x64
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.All|Win32.ActiveCfg = Release|Win32
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.All|Win32.Build.0 = Release|Win32
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.All|x64.ActiveCfg = Release|x64
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.All|x64.Build.0 = Release|x64
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.Debug|Win32.ActiveCfg = Debug|Win32
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.Debug|Win32.Build.0 = Debug|Win32
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.Debug|x64.ActiveCfg = Debug|x64
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.Debug|x64.Build.0 = Debug|x64
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.Release|Win32.ActiveCfg = Release|Win32
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.Release|Win32.Build.0 = Release|Win32
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.Release|x64.ActiveCfg = Release|x64
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72}.Release|x64.Build.0 = Release|x64
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.All|Win32.ActiveCfg = Release|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.All|Win32.Build.0 = Release|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.All|x64.ActiveCfg = Release|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.All|x64.Build.0 = Release|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Debug|Win32.Build.0 = Debug|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Debug|x64.ActiveCfg = Debug|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Debug|x64.Build.0 = Debug|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Release|Win32.ActiveCfg = Release|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Release|Win32.Build.0 = Release|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Release|x64.ActiveCfg = Release|Win32
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Release|x64.Build.0 = Release|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.All|Win32.ActiveCfg = Release|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.All|Win32.Build.0 = Release|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.All|x64.ActiveCfg = Release|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.All|x64.Build.0 = Release|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.Debug|Win32.Build.0 = Debug|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.Debug|x64.ActiveCfg = Debug|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.Debug|x64.Build.0 = Debug|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.Release|Win32.ActiveCfg = Release|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.Release|Win32.Build.0 = Release|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.Release|x64.ActiveCfg = Release|Win32
+		{583D8CEA-4171-4493-9025-B63265F408D8}.Release|x64.Build.0 = Release|Win32
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.All|Win32.ActiveCfg = Release|Win32
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.All|Win32.Build.0 = Release|Win32
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.All|x64.ActiveCfg = Release|x64
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.All|x64.Build.0 = Release|x64
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.Debug|Win32.Build.0 = Debug|Win32
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.Debug|x64.ActiveCfg = Debug|x64
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.Debug|x64.Build.0 = Debug|x64
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|Win32.ActiveCfg = Release|Win32
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|Win32.Build.0 = Release|Win32
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|x64.ActiveCfg = Release|x64
+		{87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|x64.Build.0 = Release|x64
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.All|Win32.ActiveCfg = Release|Win32
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.All|Win32.Build.0 = Release|Win32
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.All|x64.ActiveCfg = Release|x64
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.All|x64.Build.0 = Release|x64
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Debug|Win32.Build.0 = Debug|Win32
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Debug|x64.ActiveCfg = Debug|x64
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Debug|x64.Build.0 = Debug|x64
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Release|Win32.ActiveCfg = Release|Win32
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Release|Win32.Build.0 = Release|Win32
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Release|x64.ActiveCfg = Release|x64
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Release|x64.Build.0 = Release|x64
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.All|Win32.ActiveCfg = Release|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.All|Win32.Build.0 = Release|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.All|x64.ActiveCfg = Release|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.All|x64.Build.0 = Release|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.Debug|Win32.Build.0 = Debug|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.Debug|x64.ActiveCfg = Debug|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.Debug|x64.Build.0 = Debug|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.Release|Win32.ActiveCfg = Release|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.Release|Win32.Build.0 = Release|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.Release|x64.ActiveCfg = Release|Win32
+		{45CD36EE-0AF3-4387-8790-4F11E928299D}.Release|x64.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2812,7 +3059,6 @@ Global
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{9A5DDF08-C88C-4A35-B7F6-D605228446BD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{D0B36172-CD76-454A-9B89-990025266C2A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{05C9FB27-480E-4D53-B3B7-6338E2526666} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{CC1DD008-9406-448D-A0AD-33C3186CFADB} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{48414740-C693-4968-9846-EE058020C64F} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
@@ -2902,5 +3148,23 @@ Global
 		{C0779BCC-C037-4F58-B890-EF37BA956B3C} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{3884ADD2-91D0-4CD6-86D3-D5FB2D4AAB9E} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{5B2BACE4-0F5A-4A21-930D-C0F4B1F58FA6} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
+		{B6E22500-3DB6-4E6E-8CD5-591B781D7D99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311} = {C120A020-773F-4EA3-923F-B67AF28B750D}
+		{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33} = {C120A020-773F-4EA3-923F-B67AF28B750D}
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{0AD87FDA-989F-4638-B6E1-B0132BB0560A} = {C120A020-773F-4EA3-923F-B67AF28B750D}
+		{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
+		{77C9E0A2-177D-4BD6-9EFD-75A56F886325} = {C120A020-773F-4EA3-923F-B67AF28B750D}
+		{841C345F-FCC7-4F64-8F54-0281CEABEB01} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{7AEE504B-23B6-4B05-829E-7CD34855F146} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
+		{20179127-853B-4FE9-B7C0-9E817E6A3A72} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{6D1BC01C-3F97-4C08-8A45-69C9B94281AA} = {C120A020-773F-4EA3-923F-B67AF28B750D}
+		{583D8CEA-4171-4493-9025-B63265F408D8} = {C120A020-773F-4EA3-923F-B67AF28B750D}
+		{87933C2D-0159-46F7-B326-E1B6E982C21E} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
+		{4F990563-6DFB-45C3-B083-1938C6D7FFA4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{45CD36EE-0AF3-4387-8790-4F11E928299D} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 	EndGlobalSection
 EndGlobal

build/Makefile.am

@@ -71,7 +71,7 @@ install:
 	@echo " +                                                 +"
 	@echo " +-------------------------------------------------+"
 	@cat $(switch_srcdir)/cluecon2.tmpl
-	@sh $(switch_srcdir)/build/modcheck.sh $(modulesdir)
+	@sh $(switch_srcdir)/build/modcheck.sh $(DESTDIR)$(modulesdir)
 
 .PHONY: check dvi html info install-data \
         install-dvi install-exec install-html install-info install-pdf install-ps installcheck installdirs pdf \

build/modules.conf.in

@@ -62,6 +62,7 @@ codecs/mod_amr
 #codecs/mod_amrwb
 codecs/mod_b64
 #codecs/mod_bv
+#codecs/mod_clearmode
 #codecs/mod_codec2
 #codecs/mod_com_g729
 #codecs/mod_dahdi_codec

build/moh_version.txt

@@ -1 +1 @@
-1.0.50
+1.0.52

build/next-release.txt

@@ -1 +1 @@
-1.7.0
+1.6.20

build/sounds_version.txt

@@ -1,4 +1,9 @@
-en-us-callie 1.0.50
-ru-RU-elena 1.0.50
-fr-ca-june 1.0.18
+en-us-callie 1.0.51
+ru-RU-elena 1.0.51
+en-ca-june 1.0.51
+fr-ca-june 1.0.51
+pt-BR-karina 1.0.51
+sv-se-jakob 1.0.50
+zh-cn-sinmei 1.0.51
+zh-hk-sinmei 1.0.51
 

conf/vanilla/autoload_configs/callcenter.conf.xml

@@ -28,7 +28,7 @@
 <!-- WARNING: Configuration of XML Tiers will reset the level and position if those were supplied. -->
 <!-- WARNING: Agents and Tiers XML config shouldn't be used in a multi FS shared DB setup (Not currently supported anyway) -->
   <agents>
-    <!--<agent name="1000@default" type="callback" contact="[call_timeout=10]user/1000@default" status="Available" max-no-answer="3" wrap-up-time="10" reject-delay-time="10" busy-delay-time="60" />-->
+    <!--<agent name="1000@default" type="callback" contact="[leg_timeout=10]user/1000@default" status="Available" max-no-answer="3" wrap-up-time="10" reject-delay-time="10" busy-delay-time="60" />-->
   </agents>
   <tiers>
     <!-- If no level or position is provided, they will default to 1.  You should do this to keep db value on restart. -->

conf/vanilla/autoload_configs/conference_layouts.conf.xml

@@ -345,7 +345,7 @@
 	<image x="180" y="180" scale="180" overlap="true" reservation_id="presenter"/>
       </layout>
       <layout name="overlaps" auto-3d-position="true">
-	<image x="0" y="0" scale="360"/>
+	<image x="0" y="0" scale="360" floor-only="true"/>
 	<image x="300" y="300" scale="60" overlap="true"/>
 	<image x="240" y="300" scale="60" overlap="true"/>
 	<image x="180" y="300" scale="60" overlap="true"/>

conf/vanilla/autoload_configs/logfile.conf.xml

@@ -9,10 +9,10 @@
         <!-- File to log to -->
 	<!--<param name="logfile" value="/var/log/freeswitch.log"/>-->
         <!-- At this length in bytes rotate the log file (0 for never) -->
-        <param name="rollover" value="10485760"/>
+        <param name="rollover" value="1048576000"/>
 		<!-- Maximum number of log files to keep before wrapping -->
 		<!-- If this parameter is enabled, the log filenames will not include a date stamp -->
-		<!-- <param name="maximum-rotate" value="32"/> -->
+		<param name="maximum-rotate" value="32"/>
         <!-- Prefix all log lines by the session's uuid  -->
         <param name="uuid" value="true" />
       </settings>

conf/vanilla/autoload_configs/opus.conf.xml

@@ -7,6 +7,10 @@
         <!--<param name="packet-loss-percent" value="10"/>-->
 	<!-- Support asymmetric sample rates -->
         <!--<param name="asymmetric-sample-rates" value="1"/>-->
+
+	<!-- Enable bitrate negotiation -->
+        <!--<param name="bitrate-negotiation" value="1"/>-->
+
 	<!-- Keep FEC Enabled -->
         <param name="keep-fec-enabled" value="1"/>
 	<!--<param name="use-jb-lookahead" value="true"/> -->

conf/vanilla/autoload_configs/switch.conf.xml

@@ -48,6 +48,9 @@
     <!-- Minimum idle CPU before refusing calls -->
     <!-- <param name="min-idle-cpu" value="25"/> -->
 
+    <!-- Interval between heartbeat events -->
+    <!-- <param name="event-heartbeat-interval" value="20"/> -->
+
     <!--
 	Max number of sessions to allow at any given time.
 	

conf/vanilla/lang/es/es_ES.xml

@@ -1,8 +1,12 @@
 <include>
   <language name="es" sound-path="$${sounds_dir}/es/ES/cristina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-es-ES.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_es_ES_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-es-ES.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-es-ES.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="demo/*-es-ES.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <!--voicemail_es_ES_tts is purely implemented with tts, we have the files based one that is the default. -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds-es-ES.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
+        <X-PRE-PROCESS cmd="include" data="dir/sounds-es-ES.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+      </macros>
+    </phrases>
   </language>
 </include>

conf/vanilla/lang/es/es_MX.xml

@@ -1,8 +1,12 @@
 <include>
   <language name="es" sound-path="$${sounds_dir}/es/mx/maria" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-es-MX.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_es_MX_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-es-MX.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-es-MX.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="demo/*-es-MX.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <!--voicemail_es_MX_tts is purely implemented with tts, we have the files based one that is the default. -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds-es-MX.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
+        <X-PRE-PROCESS cmd="include" data="dir/sounds-es-MX.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+      </macros>
+    </phrases>
   </language>
 </include>

conf/vanilla/lang/pt/pt_BR.xml

@@ -1,8 +1,12 @@
 <include>
   <language name="pt" sound-path="$${sounds_dir}/pt/BR/karina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-pt-BR.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_pt_BR_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-BR.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-BR.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="demo/*-pt-BR.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <!--voicemail_pt_BR_tts is purely implemented with tts, we have the files based one that is the default. -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-BR.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
+        <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-BR.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+      </macros>
+    </phrases>
   </language>
 </include>

conf/vanilla/lang/pt/pt_PT.xml

@@ -1,8 +1,12 @@
 <include>
   <language name="pt" sound-path="$${sounds_dir}/pt/PT/karina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-pt-PT.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_pt_PT_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-PT.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-PT.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="demo/*-pt-PT.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <!--voicemail_pt_PT_tts is purely implemented with tts, we have the files based one that is the default. -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-PT.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
+        <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-PT.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
+      </macros>
+    </phrases>
   </language>
 </include>

conf/vanilla/lang/sv/sv.xml

@@ -1,7 +1,11 @@
 <include>
   <language name="sv" sound-path="$${sounds_dir}/sv/se/jakob" tts-engine="" tts-voice="">
-    <X-PRE-PROCESS cmd="include" data="ivr/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
-    <!--voicemail is purely implemented with files based one that is the default. -->
+    <phrases>
+      <macros>
+        <X-PRE-PROCESS cmd="include" data="ivr/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
+        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
+        <!--voicemail is purely implemented with files based one that is the default. -->
+      </macros>
+    </phrases>
   </language>
 </include>

configure.ac

@@ -3,10 +3,10 @@
 
 # Must change all of the below together
 # For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.7.0], bugs@freeswitch.org)
+AC_INIT([freeswitch], [1.6.20], bugs@freeswitch.org)
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
-AC_SUBST(SWITCH_VERSION_MINOR, [7])
-AC_SUBST(SWITCH_VERSION_MICRO, [0])
+AC_SUBST(SWITCH_VERSION_MINOR, [6])
+AC_SUBST(SWITCH_VERSION_MICRO, [20])
 AC_SUBST(SWITCH_VERSION_REVISION, [])
 AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
 
@@ -1273,17 +1273,36 @@ module_enabled() {
   grep -v -e "\#" -e "^\$" modules.conf | sed -e "s|^.*/||" | grep "^${1}\$" >/dev/null
 }
 
+AC_ARG_WITH(png,
+  [AS_HELP_STRING([--without-png],
+    [disable support for libpng])],
+  [with_png="$withval"],
+  [with_png="yes"])
+if test "$with_png" = "yes"; then
+  PKG_CHECK_MODULES([LIBPNG], [libpng >= 1.6.16],[
+    AM_CONDITIONAL([HAVE_PNG],[true])],[
+      PKG_CHECK_MODULES([LIBPNG], [libpng16 >= 1.6.16],[
+        AM_CONDITIONAL([HAVE_PNG],[true])],[
+          PKG_CHECK_MODULES([LIBPNG], [libpng >= 1.2.49],[
+            AM_CONDITIONAL([HAVE_PNG],[true])],[
+            AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_PNG],[false])])])])
+else
+  AM_CONDITIONAL([HAVE_PNG],[false])
+fi
+
+AC_ARG_WITH(freetype,
+  [AS_HELP_STRING([--without-freetype],
+    [disable support for freetype])],
+  [with_freetype="$withval"],
+  [with_freetype="yes"])
+if test "$with_freetype" = "yes"; then
+  PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 2.4.9],[
+    AM_CONDITIONAL([HAVE_FREETYPE],[true])],[
+    AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_FREETYPE],[false])])
+else
+  AM_CONDITIONAL([HAVE_FREETYPE],[false])
+fi
 
-PKG_CHECK_MODULES([LIBPNG], [libpng >= 1.6.16],[
-  AM_CONDITIONAL([HAVE_PNG],[true])],[
-    PKG_CHECK_MODULES([LIBPNG], [libpng16 >= 1.6.16],[
-      AM_CONDITIONAL([HAVE_PNG],[true])],[
-        PKG_CHECK_MODULES([LIBPNG], [libpng >= 1.2.49],[
-          AM_CONDITIONAL([HAVE_PNG],[true])],[
-          AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_PNG],[false])])])])
-PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 2.4.9],[
-  AM_CONDITIONAL([HAVE_FREETYPE],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_FREETYPE],[false])])
 PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.6.20])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.19])
 PKG_CHECK_MODULES([PCRE], [libpcre >= 7.8])
@@ -1805,6 +1824,7 @@ AC_CONFIG_FILES([Makefile
 		src/mod/codecs/mod_codec2/Makefile
 		src/mod/codecs/mod_com_g729/Makefile
 		src/mod/codecs/mod_dahdi_codec/Makefile
+		src/mod/codecs/mod_clearmode/Makefile
 		src/mod/codecs/mod_g723_1/Makefile
 		src/mod/codecs/mod_g729/Makefile
 		src/mod/codecs/mod_h26x/Makefile

debian/bootstrap.sh

@@ -360,8 +360,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch
 
 Package: libfreeswitch1
 Architecture: any
-Depends: \${shlibs:Depends}, \${misc:Depends},
- yasm
+Depends: \${shlibs:Depends}, \${misc:Depends}
 Recommends:
 Suggests: libfreeswitch1-dbg
 Conflicts: freeswitch-all (<= 1.6.7)
@@ -639,7 +638,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-dialplan-asterisk (= \${binary:Version}),
  freeswitch-mod-dialplan-directory (= \${binary:Version}),
  freeswitch-mod-dialplan-xml (= \${binary:Version}),
- freeswitch-mod-ldap (= \${binary:Version}),
  freeswitch-mod-dingaling (= \${binary:Version}),
  freeswitch-mod-loopback (= \${binary:Version}),
  freeswitch-mod-portaudio (= \${binary:Version}),
@@ -826,7 +824,6 @@ Package: freeswitch-meta-all-dbg
 Architecture: any
 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-meta-codecs-dbg (= \${binary:Version}),
- freeswitch-meta-lang-dbg (= \${binary:Version}),
  freeswitch-meta-mod-say (= \${binary:Version}),
  freeswitch-mod-abstraction-dbg (= \${binary:Version}),
  freeswitch-mod-avmd-dbg (= \${binary:Version}),
@@ -878,7 +875,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-dialplan-asterisk-dbg (= \${binary:Version}),
  freeswitch-mod-dialplan-directory-dbg (= \${binary:Version}),
  freeswitch-mod-dialplan-xml-dbg (= \${binary:Version}),
- freeswitch-mod-ldap-dbg (= \${binary:Version}),
  freeswitch-mod-dingaling-dbg (= \${binary:Version}),
  freeswitch-mod-loopback-dbg (= \${binary:Version}),
  freeswitch-mod-portaudio-dbg (= \${binary:Version}),

debian/copyright

@@ -1725,24 +1725,6 @@ Files: src/switch_dso.c
 Copyright: 2008 Michael Jerris
 License: BSD-like
 
-Files: libs/libks/*
- libs/libscgi/src/include/scgi_oop.h
- libs/libscgi/src/scgi.c
-Copyright: 2007-2013, Anthony Minessale II
- 2007 Michael Jerris
- 1996-2000 Gray Watson
-License: BSD-3-clause
-
-Files: libs/libks/*/ks_json.[ch]
- src/include/switch_json.h
- src/switch_json.c
-Copyright: 2009 Dave Gamble
-License: MIT/X11 (BSD like)
-
-Files: libs/libks/*/simclist.[ch]
-Copyright: 2007-2011 Mij <mij@bitchx.it>
-License: ISC
-
 Files: libs/libtpl-1.5/src/tpl.[ch]
 Copyright: 2005-2010, Troy D. Hanson
 License: BSD-2-clause

debian/freeswitch-systemd.freeswitch.service

@@ -21,7 +21,7 @@ LimitNOFILE=100000
 LimitNPROC=60000
 LimitSTACK=250000
 LimitRTPRIO=infinity
-LimitRTTIME=7000000
+LimitRTTIME=infinity
 IOSchedulingClass=realtime
 IOSchedulingPriority=2
 CPUSchedulingPolicy=rr

docs/phrase/README.TXT

@@ -7,6 +7,11 @@ to automatically generate or verify all the files exist for a particular
 language.  If you are capable of recording each language please do so and
 contribute them to the project.  As phrases are added, the files will need to be
 updated for the respective phrase_xx.xml file.
+make_checks.sh - script to compare phrase_en.xml with other language xml files.
+Script output contans prompt elements with attributes:
+translated - value 'false' or not displayed;
+transpated-to - tranlation value if exists;
+more-then-one-translation - displayed if exist two or more for given wav file.
 
 How can you contribute?
 

docs/phrase/make_checks.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+SAXON_JAR=/usr/share/java/saxon9he.jar
+XML=$1
+
+if  [ ! -f "$SAXON_JAR" ]; then
+	echo "Please update 'SAXON_JAR' varaiable value to location of SAXON jar"
+	exit -1
+fi
+
+if [ -z "$XML" ]; then
+	echo "Error: Please enter xml file name that must be ckecked."
+	echo "Exmple: make_checks.sh phrase_es_ES.xml > comparison_result.xml"
+	exit -1
+fi
+
+java -jar "$SAXON_JAR" -xsl:make_checks.xslt -t "$XML"
+

docs/phrase/make_checks.xslt

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs" version="2.0">
+
+    <xsl:template match="/">
+        <xsl:variable name="master_xml">
+            <xsl:copy-of select="document('phrase_en.xml')/*"/>
+        </xsl:variable>
+        <xsl:variable name="current_xml">
+            <xsl:copy-of select="*"/>
+        </xsl:variable>
+        <xsl:apply-templates select="$master_xml" mode="checkElements">
+            <xsl:with-param name="current_xml" select="$current_xml/*"/>
+        </xsl:apply-templates>
+    </xsl:template>
+
+    <xsl:template match="en" mode="checkElements">
+        <xsl:param name="current_xml"/>
+        <xsl:copy>
+            <xsl:attribute name="translated-to" select="name($current_xml)"/>
+            <xsl:apply-templates select="@*|node()" mode="#current">
+                <xsl:with-param name="current_xml" select="$current_xml/*"/>
+            </xsl:apply-templates>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="prompt" mode="checkElements">
+        <xsl:param name="current_xml"/>
+        <xsl:variable name="translation"
+            select="$current_xml[@filename=current()/@filename]/@phrase"/>
+        <xsl:copy>
+            <xsl:apply-templates select="@*" mode="#current"/>
+            <xsl:choose>
+                <xsl:when test="count($translation)=0">
+                    <xsl:attribute name="translated" select="false()"/>
+                </xsl:when>
+                <xsl:when test="@phrase = $translation">
+                    <xsl:attribute name="translated" select="false()"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="translated-to" select="$translation[1]"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:if test="count($translation) > 1">
+                <xsl:attribute name="more-then-one-translation" select="true()"/>
+            </xsl:if>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="@*|node()" mode="checkElements">
+        <xsl:param name="current_xml"/>
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()" mode="#current">
+                <xsl:with-param name="current_xml" select="$current_xml/*"/>
+            </xsl:apply-templates>
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>
+

docs/phrase/phrase_en.xml

@@ -89,6 +89,8 @@
       <prompt phrase="Xray" filename="120.wav"/>
       <prompt phrase="Yankee" filename="121.wav"/>
       <prompt phrase="Zulu" filename="122.wav"/>
+      <prompt phrase="Star" filename="42.wav"/>
+      <prompt phrase="Pound" filename="35.wav"/>
     </phonetic-ascii>
     <digits>
       <prompt phrase="Zero" filename="0.wav"/>
@@ -142,12 +144,12 @@
       <prompt phrase="Twentieth" filename="h-20.wav"/>
       <prompt phrase="Thirtieth" filename="h-30.wav"/>
       <prompt phrase="Hundred" filename="hundred.wav"/>
+      <prompt phrase="Thousand" filename="thousand.wav"/>
       <prompt phrase="Million" filename="million.wav"/>
       <prompt phrase="Period" filename="period.wav"/>
       <prompt phrase="Point" filename="point.wav"/>
       <prompt phrase="Pound" filename="pound.wav"/>
       <prompt phrase="Star" filename="star.wav"/>
-      <prompt phrase="Thousand" filename="thousand.wav"/>
     </digits>
     <currency>
       <prompt phrase="And" filename="and.wav"/>
@@ -174,6 +176,8 @@
       <prompt phrase="Hours" filename="hours.wav"/>
       <prompt phrase="Minute" filename="minute.wav"/>
       <prompt phrase="Minutes" filename="minutes.wav"/>
+      <prompt phrase="Second" filename="second.wav"/>
+      <prompt phrase="Seconds" filename="seconds.wav"/>
       <prompt phrase="January" filename="mon-0.wav"/>
       <prompt phrase="Febuary" filename="mon-1.wav"/>
       <prompt phrase="March" filename="mon-2.wav"/>
@@ -189,8 +193,6 @@
       <prompt phrase="O'Clock" filename="oclock.wav"/>
       <prompt phrase="oh" filename="oh.wav"/>
       <prompt phrase="P.M." filename="p-m.wav"/>
-      <prompt phrase="Second" filename="second.wav"/>
-      <prompt phrase="Seconds" filename="seconds.wav"/>
       <prompt phrase="Today" filename="today.wav"/>
       <prompt phrase="Tomorrow" filename="tomorrow.wav"/>
       <prompt phrase="Yesterday" filename="yesterday.wav"/>
@@ -288,6 +290,11 @@
       <prompt phrase="Message from..." filename="vm-message_from.wav"/>
       <prompt phrase="Nobody is currently leaving a message in this voicemail box." filename="vm-nobody_leaving_message.wav"/>
       <prompt phrase="last" filename="vm-last.wav"/>
+      <prompt phrase="To delete greeting" filename="vm-delete_greeting.wav"/>
+      <prompt phrase="To listen to greeting..." filename="vm-listen_to_greeting.wav"/>
+      <prompt phrase="For the main menu..." filename="vm-main_menu_alt.wav"/>
+      <prompt phrase="message forwarded" filename="vm-message_forwarded.wav"/>
+      <prompt phrase="The extension you have dialed does not answer and there is no voicemail box set up for this extension." filename="vm-no_answer_no_vm.wav"/>
     </voicemail>
     <directory>
       <prompt phrase="Please enter the first few letters of the persons" filename="dir-enter_person.wav"/>
@@ -310,6 +317,12 @@
       <prompt phrase="press" filename="dir-press.wav" info="we can copy vm/vm-press.wav"/>
       <prompt phrase="For the next entry..." filename="dir-for_next.wav" note="re-recorded because original was wrong"/>
       <prompt phrase="Please enter the first few letters of the person's first or last name" filename="dir-enter_person_first_or_last.wav"/>
+      <prompt phrase="Please enter the first few letters of the person's" filename="dir-enter-person.wav"/>
+      <prompt phrase="Your search matched no results, try again." filename="dir-no_match_entry.wav"/>
+      <prompt phrase="No more results" filename="dir-no_more_result.wav"/>
+      <prompt phrase="You need to specify a minimum of..." filename="dir-specify_mininum_first.wav"/>
+      <prompt phrase="To start a new search" filename="dir-to_make_new_search.wav"/>
+      <prompt phrase="Your search returned too many results, please try again." filename="dir-to_many_result.wav"/>
     </directory>
     <conference>
       <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/>
@@ -347,6 +360,8 @@
       <prompt phrase="...other persons in this conference." filename="conf-other_persons_conference.wav"/>
       <prompt phrase="There is one other person in this conference." filename="conf-one_other_person_conference.wav"/>
       <prompt phrase="There is one other member in this conference." filename="conf-one_other_member_conference.wav"/>
+      <prompt phrase="This conference is being recorded." filename="conf-being_recorded.wav"/>
+      <prompt phrase="This conference is no longer being recorded." filename="conf-no_longer_being_recorded.wav"/>
     </conference>
     <ivr>
       <prompt phrase="Account number" filename="ivr-account_number.wav"/>
@@ -546,7 +561,6 @@
       <prompt phrase="3... 2... 1... WE'RE ASTERISK FREE!!!" filename="ivr-were_asterisk_free.wav"/>
       <prompt phrase="Thank you for calling Douche Telecom, where we make sure that your communications never have that 'not so fresh' feeling!" filename="ivr-douche_telecom.wav"/>
       <prompt phrase="To learn more about FreeSWITCH..." filename="ivr-to_learn_more_about_freeswitch.wav"/>
-      <prompt phrase="Asterisk is like syphilis: it hurts until it's gone." filename="ivr-asterisk_like_syphilis.wav"/>
       <prompt phrase="There is..." filename="ivr-there_is.wav"/>
       <prompt phrase="That number is on the Do Not Call list." filename="ivr-do_not_call_list.wav"/>
       <prompt phrase="The call attempt has been aborted." filename="ivr-call_attempt_aborted.wav"/>
@@ -670,12 +684,16 @@
       <prompt phrase="This is a reminder for..." filename="ivr-reminder_for.wav"/>
       <prompt phrase="You have an appointment scheduled for..." filename="ivr-appointment_schedule_for.wav"/>
       <prompt phrase="Your verification PIN is..." filename="ivr-Your_verification_PIN_is.wav"/>
+      <prompt phrase="To hear the hotseat menu, please enter your extension followed by the pound or hash key." filename="ivr-hotseat_intro.wav"/>
+      <prompt phrase="To modify main prompt..." filename="ivr-modify_main_prompt.wav"/>
+      <prompt phrase="Please enter your pin number followed by the pound or hash key." filename="ivr-hotseat_pin.wav"/>
+      <prompt phrase="To hotseat this phone to your extension, press 1. To remove hotseat on this phone, press 2." filename="ivr-hotseat_options.wav"/>
       <!-- The following phrases still need to be recorded -->
       <prompt phrase="You have reached the maximum number of channels." filename="ivr-maximum_number_of_channels.wav"/>
       <prompt phrase="" filename=""/>
       <prompt phrase="" filename=""/>
       <prompt phrase="" filename=""/>
-
+      <prompt phrase="To do an echo test" filename="ivr-to_do_a_echo_test.wav"/>
     </ivr>
     <misc>
       <prompt phrase="This call has been secured" filename="call_secured.wav"/>
@@ -712,8 +730,14 @@
       <prompt phrase="More information is available online at wiki dot FreeSWITCH dot org." filename="misc-more_info_wiki.wav"/>
       <prompt phrase="Welcome to the FreeSWITCH community conference call!" filename="misc-welcome_freeswitch_conf_call.wav"/>
       <prompt phrase="E one sixty-four dot org." filename="misc-e164_dot_org.wav"/>
+      <prompt phrase="This phone is not authorized to make outside calls." filename="phone_not_auth.wav"/>
+      <prompt phrase="I'm sorry." filename="sorry.wav"/>
+      <prompt phrase="This call may be monitored or recorded for quality and training purposes." filename="call_monitoring_blurb.wav"/>
+      <prompt phrase="Spanish" filename="es.wav"/>
+      <prompt phrase="That is an invalid extension." filename="invalid_extension.wav"/>
+      <prompt phrase="English" filename="en.wav"/>
     </misc>
-    <zrtp>
+    <base256>
       <!-- base256 prompts for SAS -->
       <prompt phrase="Algol" filename="Algol.wav"/>
       <prompt phrase="Apollo" filename="Apollo.wav"/>
@@ -808,6 +832,7 @@
       <prompt phrase="beehive" filename="beehive.wav"/>
       <prompt phrase="beeswax" filename="beeswax.wav"/>
       <prompt phrase="befriend" filename="befriend.wav"/>
+      <prompt phrase="being" filename="being.wav"/>
       <prompt phrase="belowground" filename="belowground.wav"/>
       <prompt phrase="berserk" filename="berserk.wav"/>
       <prompt phrase="bifocals" filename="bifocals.wav"/>
@@ -865,6 +890,7 @@
       <prompt phrase="concert" filename="concert.wav"/>
       <prompt phrase="concurrent" filename="concurrent.wav"/>
       <prompt phrase="confidence" filename="confidence.wav"/>
+      <prompt phrase="conference" filename="conference.wav"/>
       <prompt phrase="conformist" filename="conformist.wav"/>
       <prompt phrase="congregate" filename="congregate.wav"/>
       <prompt phrase="consensus" filename="consensus.wav"/>
@@ -992,6 +1018,7 @@
       <prompt phrase="inventive" filename="inventive.wav"/>
       <prompt phrase="inverse" filename="inverse.wav"/>
       <prompt phrase="involve" filename="involve.wav"/>
+      <prompt phrase="is" filename="is.wav"/>
       <prompt phrase="island" filename="island.wav"/>
       <prompt phrase="jawbone" filename="jawbone.wav"/>
       <prompt phrase="keyboard" filename="keyboard.wav"/>
@@ -1001,6 +1028,7 @@
       <prompt phrase="leprosy" filename="leprosy.wav"/>
       <prompt phrase="letterhead" filename="letterhead.wav"/>
       <prompt phrase="liberty" filename="liberty.wav"/>
+      <prompt phrase="longer" filename="longer.wav"/>
       <prompt phrase="locale" filename="locale.wav"/>
       <prompt phrase="lockup" filename="lockup.wav"/>
       <prompt phrase="maritime" filename="maritime.wav"/>
@@ -1028,6 +1056,7 @@
       <prompt phrase="newborn" filename="newborn.wav"/>
       <prompt phrase="newsletter" filename="newsletter.wav"/>
       <prompt phrase="nightbird" filename="nightbird.wav"/>
+      <prompt phrase="no" filename="no.wav"/>
       <prompt phrase="obtuse" filename="obtuse.wav"/>
       <prompt phrase="offload" filename="offload.wav"/>
       <prompt phrase="onlooker" filename="onlooker.wav"/>
@@ -1087,6 +1116,7 @@
       <prompt phrase="regain" filename="regain.wav"/>
       <prompt phrase="reindeer" filename="reindeer.wav"/>
       <prompt phrase="rematch" filename="rematch.wav"/>
+      <prompt phrase="recorded" filename="recorded.wav"/>
       <prompt phrase="repay" filename="repay.wav"/>
       <prompt phrase="repellent" filename="repellent.wav"/>
       <prompt phrase="replica" filename="replica.wav"/>
@@ -1174,6 +1204,7 @@
       <prompt phrase="telephone" filename="telephone.wav"/>
       <prompt phrase="tempest" filename="tempest.wav"/>
       <prompt phrase="therapist" filename="therapist.wav"/>
+      <prompt phrase="this" filename="this.wav"/>
       <prompt phrase="tiger" filename="tiger.wav"/>
       <prompt phrase="tissue" filename="tissue.wav"/>
       <prompt phrase="tobacco" filename="tobacco.wav"/>
@@ -1227,6 +1258,8 @@
       <prompt phrase="willow" filename="willow.wav"/>
       <prompt phrase="woodlark" filename="woodlark.wav"/>
       <prompt phrase="yesteryear" filename="yesteryear.wav"/>
+    </base256>
+    <zrtp>
       <!-- Event prompts -->
       <prompt phrase="Welcome to the ZRTP security enrollment agent." filename="zrtp-enroll_welcome.wav"/>
       <prompt phrase="You must check the authentication string with your partner. If it doesn't match, it indicates the presence of a wire tapper." filename="zrtp-check_sas.wav"/>

docs/phrase/phrase_es.xml

@@ -358,4 +358,4 @@ I will translate them anyways
       <prompt phrase="Un error ha ocurrido, por favor contacte al administrador" filename="error.wav"/>
     </misc>
   </en>
-</language>
+</language>

docs/phrase/phrase_es_ES.xml

@@ -477,7 +477,7 @@
       <prompt phrase="Este teléfono no está autorizado para realizar llamadas hacia fuera." filename="phone_not_auth.wav"/>
       <prompt phrase="Lo siento." filename="sorry.wav"/>
     </misc>
-    <zrtp>
+    <base256>
       <!-- base256 prompts for SAS -->
       <prompt phrase="Algol" filename="Algol.wav"/>
       <prompt phrase="Apollo" filename="Apollo.wav"/>
@@ -991,6 +991,8 @@
       <prompt phrase="willow" filename="willow.wav"/>
       <prompt phrase="woodlark" filename="woodlark.wav"/>
       <prompt phrase="yesteryear" filename="yesteryear.wav"/>
+    </base256>
+    <zrtp>
       <!-- Event prompts -->
       <prompt phrase="Bienvenidos al servicio de inscripción ZRTP." filename="zrtp-enroll_welcome.wav"/>
       <prompt phrase="Usted debe verificar la cadena de caracteres con su destino. Si no coincide, indica la presencia de una escucha telefónica." filename="zrtp-check_sas.wav"/>
@@ -1009,4 +1011,4 @@
       <prompt phrase="Securizando su llamada." filename="zrtp-status_securing.wav"/>
     </zrtp>
   </es_ES>
-<language>
+</language>

docs/phrase/phrase_es_MX.xml

@@ -476,7 +476,7 @@
       <prompt phrase="Este teléfono no está autorizado para realizar llamadas hacia fuera." filename="phone_not_auth.wav"/>
       <prompt phrase="Lo siento." filename="sorry.wav"/>
     </misc>
-    <zrtp>
+    <base256>
       <!-- base256 prompts for SAS -->
       <prompt phrase="Algol" filename="Algol.wav"/>
       <prompt phrase="Apollo" filename="Apollo.wav"/>
@@ -990,6 +990,8 @@
       <prompt phrase="willow" filename="willow.wav"/>
       <prompt phrase="woodlark" filename="woodlark.wav"/>
       <prompt phrase="yesteryear" filename="yesteryear.wav"/>
+    </base256>
+    <zrtp>
       <!-- Event prompts -->
       <prompt phrase="Bienvenidos al servicio de inscripción ZRTP." filename="zrtp-enroll_welcome.wav"/>
       <prompt phrase="Usted debe verificar la cadena de caracteres con su destino. Si no coincide, indica la presencia de una escucha telefónica." filename="zrtp-check_sas.wav"/>

docs/phrase/phrase_pt_BR.xml

@@ -470,7 +470,7 @@
       <prompt phrase="Este telefone não esta autorizado para realizar ligações ao exterior." filename="phone_not_auth.wav"/>
       <prompt phrase="Lamento." filename="sorry.wav"/>
     </misc>
-    <zrtp>
+    <base256>
       <!--  base256 prompts for SAS --> 
       <prompt phrase="Algol" filename="Algol.wav"/> 
       <prompt phrase="Apollo" filename="Apollo.wav"/> 
@@ -984,6 +984,8 @@
       <prompt phrase="willow" filename="willow.wav"/> 
       <prompt phrase="woodlark" filename="woodlark.wav"/> 
       <prompt phrase="yesteryear" filename="yesteryear.wav"/> 
+    </base256>
+    <zrtp>
       <!--  Event prompts --> 
       <prompt phrase="Bem-vindo ao agente de registro de segurança ZRTP." filename="zrtp-enroll_welcome.wav"/> 
       <prompt phrase="Você deve verificar a autentificação com o seu destinatário. Se não coincidir, isso indica presença de um dispositivo de escuta telefonica." filename="zrtp-check_sas.wav"/> 

docs/phrase/phrase_pt_PT.xml

@@ -469,7 +469,7 @@
       <prompt phrase="Este telefone não está autorizado a realizar chamadas para o exterior." filename="phone_not_auth.wav"/>
       <prompt phrase="Lamento." filename="sorry.wav"/>
     </misc>
-    <zrtp>
+    <base256>
       <!-- base256 prompts for SAS -->
       <prompt phrase="Algol" filename="Algol.wav"/>
       <prompt phrase="Apollo" filename="Apollo.wav"/>
@@ -983,6 +983,8 @@
       <prompt phrase="willow" filename="willow.wav"/>
       <prompt phrase="woodlark" filename="woodlark.wav"/>
       <prompt phrase="yesteryear" filename="yesteryear.wav"/>
+    </base256>
+    <zrtp>
       <!-- Event prompts -->
       <prompt phrase="Bem-vindo ao agente de registo ZRTP." filename="zrtp-enroll_welcome.wav"/>
       <prompt phrase="Deve verificar a chave de autenticação com destinatário. Se não for igual, indica a presença de uma escuta." filename="zrtp-check_sas.wav"/>

docs/phrase/phrase_zh_CN.xml

@@ -22,6 +22,17 @@
 			<prompt phrase="分号" filename="59.wav"/>
 			<prompt phrase="脱字符" filename="94.wav"/>
 			<prompt phrase="竖线" filename="124.wav"/>
+			<prompt phrase="加号" filename="43.wav"/>
+			<prompt phrase="左括号" filename="40.wav"/>
+			<prompt phrase="右括号" filename="41.wav"/>
+			<prompt phrase="左大括号" filename="123.wav"/>
+			<prompt phrase="右大括号" filename="125.wav"/>
+			<prompt phrase="左方括号" filename="91.wav"/>
+			<prompt phrase="右方括号" filename="93.wav"/>
+			<prompt phrase="逗号" filename="44.wav"/>
+			<prompt phrase="反撇号" filename="96.wav"/>
+			<prompt phrase="小于号" filename="60.wav"/>
+			<prompt phrase="大于号" filename="62.wav"/>
 			<prompt phrase="A" filename="97.wav"/>
 			<prompt phrase="B" filename="98.wav"/>
 			<prompt phrase="C" filename="99.wav"/>
@@ -142,7 +153,7 @@
 			<prompt phrase="And" filename="and.wav"/>
 			<prompt phrase="分" filename="cent.wav"/>
 			<prompt phrase="Central" filename="central.wav"/>
-			<prompt phrase="分每分钟" filename="cents-per-minute.wav"/>
+			<prompt phrase="美分每分钟" filename="cents-per-minute.wav"/>
 			<prompt phrase="分" filename="cents.wav"/>
 			<prompt phrase="元" filename="dollar.wav"/>
 			<prompt phrase="元" filename="dollars.wav"/>
@@ -163,7 +174,7 @@
 			<prompt phrase="星期四" filename="day-4.wav"/>
 			<prompt phrase="星期五" filename="day-5.wav"/>
 			<prompt phrase="星期六" filename="day-6.wav"/>
-			<prompt phrase="时" filename="hour.wav"/>
+			<prompt phrase="小时" filename="hour.wav"/>
 			<prompt phrase="小时" filename="hours.wav"/>
 			<prompt phrase="分" filename="minute.wav"/>
 			<prompt phrase="分" filename="minutes.wav"/>
@@ -180,7 +191,7 @@
 			<prompt phrase="十一月" filename="mon-10.wav"/>
 			<prompt phrase="十二月" filename="mon-11.wav"/>
 			<prompt phrase="点" filename="oclock.wav"/>
-			<prompt phrase="oh" filename="oh.wav"/>
+			<prompt phrase="零" filename="oh.wav"/>
 			<prompt phrase="下午" filename="p-m.wav"/>
 			<prompt phrase="秒" filename="second.wav"/>
 			<prompt phrase="秒" filename="seconds.wav"/>
@@ -191,8 +202,10 @@
 		<voicemail>
 			<prompt phrase="分机" filename="vm-person.wav"/>
 			<prompt phrase="设置紧急" filename="vm-marked-urgent.wav"/>
+			<prompt phrase="标记新" filename="vm-marked_new.wav"/>
 			<prompt phrase="已发送邮件" filename="vm-emailed.wav"/>
 			<prompt phrase="您有" filename="vm-you_have.wav"/>
+			<prompt phrase="信息来自" filename="vm-from.wav"/>
 			<prompt phrase="请输入您的ID，然后按" filename="vm-enter_id.wav"/>
 			<prompt phrase="请输入您的密码，然后按" filename="vm-enter_pass.wav"/>
 			<prompt phrase="登录错误" filename="vm-fail_auth.wav"/>
@@ -210,15 +223,35 @@
 			<prompt phrase="新" filename="vm-new.wav"/>
 			<prompt phrase="紧急留言已保存" filename="vm-urgent-saved.wav"/>
 			<prompt phrase="已保存" filename="vm-saved.wav"/>
-			<prompt phrase="信息" filename="vm-message.wav"/>
-			<prompt phrase="信息" filename="vm-messages.wav"/>
+			<prompt phrase="留言" filename="vm-message.wav"/>
+			<prompt phrase="留言" filename="vm-message_alt.wav"/>
+			<prompt phrase="留言" filename="vm-messages.wav"/>
+			<prompt phrase="留言" filename="vm-messages_alt.wav"/>
+			<prompt phrase="没有留言" filename="vm-no_more_messages.wav"/>
+			<prompt phrase="重复此留言" filename="vm-repeat_message.wav"/>
+			<prompt phrase="删除此留言" filename="vm-delete_message.wav"/>
+			<prompt phrase="保存此留言" filename="vm-save_message.wav"/>
+			<prompt phrase="播放下一个留言" filename="vm-play_next_message.wav"/>
+			<prompt phrase="播放上一个留言" filename="vm-play_previous_message.wav"/>
+			<prompt phrase="删除留言" filename="vm-undelete_message.wav"/>
+			<prompt phrase="现在发送此留言" filename="vm-send_message_now.wav"/>
+			<prompt phrase="听到留言信息" filename="vm-message_envelope.wav"/>
+			<prompt phrase="已更改为" filename="vm-has_been_changed_to.wav"/>
 			<prompt phrase="按" filename="vm-press.wav"/>
+			<prompt phrase="收到" filename="vm-received.wav"/>
+			<prompt phrase="然后" filename="vm-followed_by.wav"/>
+			<prompt phrase="这是个无效的分机" filename="vm-that_was_an_invalid_ext.wav"/>
+			<prompt phrase="取消删除" filename="vm-undeleted.wav"/>
+			<prompt phrase="然后按#号" filename="vm-followed_by_pound.wav"/>
+			<prompt phrase="下一个" filename="vm-next.wav"/>
 			<prompt phrase="听取新留言" filename="vm-listen_new.wav"/>
-			<prompt phrase="听取已保存的留言" filename="vm-listen_saved.wav"/>
+			<prompt phrase="听取已保存的留言" filename="vm-listen_saved.vmwav"/>
 			<prompt phrase="高级选项" filename="vm-advanced.wav"/>
-			<prompt phrase="转发留言" filename="vm-to_forward.wav"/>
+			<prompt phrase="高级选项" filename="vm-advanced_alt.wav"/>
 			<prompt phrase="退出" filename="vm-to_exit.wav"/>
+			<prompt phrase="退出" filename="vm-to_exit_alt.wav"/>
 			<prompt phrase="录制欢迎音" filename="vm-record_greeting.wav"/>
+			<prompt phrase="录制欢迎音" filename="vm-to_record_greeting.wav"/>
 			<prompt phrase="选择一个欢迎音" filename="vm-choose_greeting.wav"/>
 			<prompt phrase="录制您的名字" filename="vm-record_name2.wav"/>
 			<prompt phrase="主菜单" filename="vm-main_menu.wav"/>
@@ -226,10 +259,14 @@
 			<prompt phrase="保存录音" filename="vm-save_recording.wav"/>
 			<prompt phrase="重新录音" filename="vm-rerecord.wav"/>
 			<prompt phrase="将该留言设置为紧急" filename="vm-mark-urgent.wav"/>
+			<prompt phrase="标记为新留言" filename="vm-mark_message_new.wav"/>
 			<prompt phrase="继续" filename="vm-continue.wav"/>
 			<prompt phrase="重听" filename="vm-listen_to_recording_again.wav"/>
 			<prompt phrase="删除录音" filename="vm-delete_recording.wav"/>
 			<prompt phrase="将录音转发到您的电子邮箱" filename="vm-forward_to_email.wav"/>
+			<prompt phrase="转发留言" filename="vm-to_forward.wav"/>
+			<prompt phrase="请输入分机号码转发此留言" filename="vm-forward_enter_ext.wav"/>
+			<prompt phrase="给留言添加介绍" filename="vm-forward_add_intro.wav"/>
 			<prompt phrase="欢迎" filename="vm-greeting.wav"/>
 			<prompt phrase="已选择" filename="vm-selected.wav"/>
 			<prompt phrase="不存在" filename="vm-not_available.wav"/>
@@ -246,6 +283,15 @@
 			<prompt phrase="您所拨号的用户不可达，他也没有语音邮箱" filename="vm-not_available_no_voicemail.wav"/>
 			<prompt phrase="您输入的密码长度不够" filename="voicemail/vm-pin_below_minimum_length.wav"/>
 			<prompt phrase="最小的密码长度是..." filename="voicemail/vm-minimum_pin_length_is.wav"/>
+			<prompt phrase="您的密码已更改" filename="vm-password_has_been_changed.wav"/>
+			<prompt phrase="请输入您的新密码并按#键结束" filename="vm-enter_new_pin.wav"/>
+			<prompt phrase="您输入的密码无效" filename="vm-password_not_valid.wav"/>
+			<prompt phrase="诸如1111或1234这样的密码是不安全的" filename="vm-password_is_not_secure.wav"/>
+			<prompt phrase="请选择不包含所有重复或连续数字的密码" filename="vm-choose_password.wav"/>
+			<prompt phrase="请记住，您的语音信箱密码也是您的网页界面密码" filename="vm-voicemail_password_is_web_password.wav"/>
+			<prompt phrase="留言来自." filename="vm-message_from.wav"/>
+			<prompt phrase="当前语音信箱没有新留言" filename="vm-nobody_leaving_message.wav"/>
+			<prompt phrase="最后" filename="vm-last.wav"/>
 		</voicemail>
 		<directory>
 			<prompt phrase="请输入姓名拼音的前几位字母" filename="dir-enter_person.wav"/>
@@ -296,10 +342,15 @@
 			<prompt phrase="...名听众参与本次会议" filename="conf-listeners_in_conference.wav"/>
 			<prompt phrase="...名听众参与本次会议" filename="conf-listener_in_conference.wav"/>
 			<prompt phrase="...名与会者参与本次会议" filename="conf-members_in_conference.wav"/>
-			<prompt phrase="本会议现在是 Q and A 模式" filename="conference/conf-conference_is_in_qna_mode.wav"/>
-			<prompt phrase="Q and A 模式..." filename="conference/conf-qna_mode.wav"/>
-			<prompt phrase="进入声音..." filename="conference/conf-entry_sound.wav"/>
-			<prompt phrase="退出声音..." filename="conference/conf-exit_sound.wav"/>
+			<prompt phrase="本会议现在是 Q and A 模式" filename="conf-conference_is_in_qna_mode.wav"/>
+			<prompt phrase="Q and A 模式..." filename="conf-qna_mode.wav"/>
+			<prompt phrase="进入声音..." filename="conf-entry_sound.wav"/>
+			<prompt phrase="退出声音..." filename="conf-exit_sound.wav"/>
+			<prompt phrase="会议室已满，请联系管理员" filename="conf-conference_is_full.wav"/>
+			<prompt phrase="您的会议将很快开始，请保持在线" filename="conf-conference_will_start_shortly.wav"/>
+			<prompt phrase="... 本次会议的其他人." filename="conf-other_persons_conference.wav"/>
+			<prompt phrase="在本次会议还有一个人" filename="conf-one_other_person_conference.wav"/>
+			<prompt phrase="此会议中还有一名成员" filename="conf-one_other_member_conference.wav"/>
 		</conference>
 		<ivr>
 			<prompt phrase="账号" filename="ivr-account_number.wav"/>
@@ -494,7 +545,6 @@
 			<prompt phrase="会议室已满，请联系管理员" filename="conf-conference_is_full.wav"/>
 			<prompt phrase="操作受限" filename="ivr-not_have_permission.wav"/>
 		</ivr>
-
 		<misc>
 			<prompt phrase="已进入安全通信" filename="call_secured.wav"/>
 			<prompt phrase="然后按#号" filename="followed.wav"/>

freeswitch-config-rayo.spec

@@ -28,7 +28,7 @@
 #
 ######################################################################################################################
 
-%define version 1.7.0
+%define version 1.6.0
 %define release 1
 
 %define fsname freeswitch

freeswitch.spec

@@ -47,7 +47,7 @@
 %{?with_mod_esl:%define build_mod_esl 1 }
 %{?with_mod_shout:%define build_mod_shout 1 }
 
-%define version 1.7.0
+%define version 1.6.0
 %define release 1
 
 ######################################################################################################################
@@ -191,7 +191,6 @@ BuildRequires: ilbc2-devel
 BuildRequires: g722_1-devel
 BuildRequires: libcodec2-devel
 BuildRequires: libsilk-devel
-BuildRequires: libvpx2-devel >= 2.0.0
 BuildRequires: libyuv-devel >= 0.0.1280
 BuildRequires: lua-devel
 BuildRequires: mongo-c-driver-devel
@@ -736,6 +735,8 @@ H.263/H.264 Video Codec support for FreeSWITCH open source telephony platform
 Summary:        iLCB Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       ilbc2
+
 
 %description codec-ilbc
 iLBC Codec support for FreeSWITCH open source telephony platform

html5/verto/js/Makefile

@@ -1,4 +1,4 @@
-JSFILES=src/jquery.FSRTC.js src/jquery.jsonrpcclient.js src/jquery.verto.js
+JSFILES=src/jquery.FSRTC.js src/jquery.jsonrpcclient.js src/jquery.verto.js src/vendor/adapter-latest.js
 
 all: jsmin verto-min.js
 

html5/verto/js/src/jquery.FSRTC.js

@@ -100,22 +100,10 @@
             candidateList: []
         };
 
-
-	if (moz) {
-            this.constraints = {
-		offerToReceiveAudio: this.options.useSpeak === "none" ? false : true,
-		offerToReceiveVideo: this.options.useVideo ? true : false,
-            };
-	} else {
-            this.constraints = {
-		optional: [{
-		    'DtlsSrtpKeyAgreement': 'true'
-		}],mandatory: {
-		    OfferToReceiveAudio: this.options.useSpeak === "none" ? false : true,
-		    OfferToReceiveVideo: this.options.useVideo ? true : false,
-		}
-            };
-	}
+	this.constraints = {
+	    offerToReceiveAudio: this.options.useSpeak === "none" ? false : true,
+	    offerToReceiveVideo: this.options.useVideo ? true : false,
+	};
 
         if (self.options.useVideo) {
             self.options.useVideo.style.display = 'none';
@@ -133,19 +121,11 @@
         if (obj) {
             self.options.useVideo = obj;
 	    self.options.localVideo = local;
-	    if (moz) {
-		self.constraints.offerToReceiveVideo = true;
-	    } else {
-		self.constraints.mandatory.OfferToReceiveVideo = true;
-	    }
+	    self.constraints.offerToReceiveVideo = true;
         } else {
             self.options.useVideo = null;
 	    self.options.localVideo = null;
-            if (moz) {
-		self.constraints.offerToReceiveVideo = false;
-	    } else {
-		self.constraints.mandatory.OfferToReceiveVideo = false;
-	    }
+	    self.constraints.offerToReceiveVideo = false;
         }
 
         if (self.options.useVideo) {
@@ -193,18 +173,9 @@
     };
 
     function setCompat() {
-        $.FSRTC.moz = !!navigator.mozGetUserMedia;
-        //navigator.getUserMedia || (navigator.getUserMedia = navigator.mozGetUserMedia || navigator.webkitGetUserMedia || navigator.msGetUserMedia);
-        if (!navigator.getUserMedia) {
-            navigator.getUserMedia = navigator.mozGetUserMedia || navigator.webkitGetUserMedia || navigator.msGetUserMedia;
-        }
     }
 
     function checkCompat() {
-        if (!navigator.getUserMedia) {
-            alert('This application cannot function in this browser.');
-            return false;
-        }
         return true;
     }
 
@@ -258,6 +229,21 @@
         doCallback(self, "onICESDP", msg);
     }
 
+    FSRTCattachMediaStream = function(element, stream) {
+	if (element && element.id && attachMediaStream) {
+	    attachMediaStream(element, stream);
+	} else {
+            if (typeof element.srcObject !== 'undefined') {
+		element.srcObject = stream;
+	    } else if (typeof element.src !== 'undefined') {
+		element.src = URL.createObjectURL(stream);
+	    } else {
+		console.error('Error attaching stream to element.');
+	    }
+	}
+    }
+
+    
     function onRemoteStream(self, stream) {
         if (self.options.useVideo) {
             self.options.useVideo.style.display = 'block';
@@ -266,16 +252,8 @@
         var element = self.options.useAudio;
         console.log("REMOTE STREAM", stream, element);
 
-        if (typeof element.srcObject !== 'undefined') {
-            element.srcObject = stream;
-        } else if (typeof element.mozSrcObject !== 'undefined') {
-            element.mozSrcObject = stream;
-        } else if (typeof element.src !== 'undefined') {
-            element.src = URL.createObjectURL(stream);
-        } else {
-            console.error('Error attaching stream to element.');
-        }
-
+	FSRTCattachMediaStream(element, stream);
+	
         self.options.useAudio.play();
         self.remoteStream = stream;
     }
@@ -306,11 +284,7 @@
 
         if (self.options.useVideo) {
             self.options.useVideo.style.display = 'none';
-            if (moz) {
-                self.options.useVideo['mozSrcObject'] = null;
-            } else {
-                self.options.useVideo['src'] = '';
-            }
+            self.options.useVideo['src'] = '';
         }
 
         if (self.localStream) {
@@ -319,7 +293,7 @@
             } else {
 		if (self.localStream.active){
                     var tracks = self.localStream.getTracks();
-                    console.error(tracks);
+                    console.log(tracks);
 		    tracks.forEach(function(track, index){
 			console.log(track);
 			track.stop();
@@ -331,11 +305,7 @@
 
         if (self.options.localVideo) {
             self.options.localVideo.style.display = 'none';
-            if (moz) {
-                self.options.localVideo['mozSrcObject'] = null;
-            } else {
-                self.options.localVideo['src'] = '';
-            }
+            self.options.localVideo['src'] = '';
         }
 
 	if (self.options.localVideoStream) {
@@ -344,7 +314,7 @@
             } else {
 		if (self.options.localVideoStream.active){
                     var tracks = self.options.localVideoStream.getTracks();
-                    console.error(tracks);
+                    console.log(tracks);
 		    tracks.forEach(function(track, index){
 			console.log(track);
 			track.stop();
@@ -426,7 +396,7 @@
         function onSuccess(stream) {
             self.localStream = stream;
 
-            self.peer = RTCPeerConnection({
+            self.peer = FSRTCPeerConnection({
                 type: self.type,
                 attachStream: self.localStream,
                 onICE: function(candidate) {
@@ -452,7 +422,7 @@
                 }
             });
 
-            onStreamSuccess(self);
+            onStreamSuccess(self, stream);
         }
 
         function onError(e) {
@@ -469,8 +439,8 @@
 		constraints: {
                     audio: false,
                     video: {
-			mandatory: self.options.videoParams,
-			optional: []
+			//mandatory: self.options.videoParams,
+			//optional: []
                     },
 		},
 		localVideo: self.options.localVideo,
@@ -501,45 +471,28 @@
 	    console.log("Microphone Disabled");
 	    audio = false;
 	} else if (obj.options.videoParams && obj.options.screenShare) {//obj.options.videoParams.chromeMediaSource == 'desktop') {
-
-	    //obj.options.videoParams = {
-	//	chromeMediaSource: 'screen',
-	//	maxWidth:screen.width,
-	//	maxHeight:screen.height
-	//	chromeMediaSourceId = sourceId;
-	  //  };
-
-	    console.error("SCREEN SHARE");
+	    console.error("SCREEN SHARE", obj.options.videoParams);
 	    audio = false;
 	} else {
 	    audio = {
-		mandatory: {},
-		optional: []
 	    };
 
-	    if (obj.options.useMic !== "any") {
-		audio.optional = [{sourceId: obj.options.useMic}]
-	    }
-
 	    if (obj.options.audioParams) {
-		for (var key in obj.options.audioParams) {
-		    var con = {};
-		    con[key] = obj.options.audioParams[key];
-		    audio.optional.push(con);
-		}
+	        audio = obj.options.audioParams;
+            }
+
+	    if (obj.options.useMic !== "any") {
+		//audio.optional = [{sourceId: obj.options.useMic}]
+		audio.deviceId = {exact: obj.options.useMic};
 	    }
-
-
 	}
 
 	if (obj.options.useVideo && obj.options.localVideo) {
             getUserMedia({
 		constraints: {
                     audio: false,
-                    video: {
-			mandatory: obj.options.videoParams,
-			optional: []
-                    },
+                    video: obj.options.videoParams
+                    
 		},
 		localVideo: obj.options.localVideo,
 		onsuccess: function(e) {self.options.localVideoStream = e; console.log("local video ready");},
@@ -549,33 +502,69 @@
 
 	var video = {};
 	var bestFrameRate = obj.options.videoParams.vertoBestFrameRate;
+	var minFrameRate = obj.options.videoParams.minFrameRate || 15;
 	delete obj.options.videoParams.vertoBestFrameRate;
 
-	video = {
-	    mandatory: obj.options.videoParams,
-	    optional: []
-        }	    	    
-	
-	var useVideo = obj.options.useVideo;
+	if (obj.options.screenShare) {
+	    if (!obj.options.useCamera && !!navigator.mozGetUserMedia) {
+		//This is an issue, only FireFox needs to ask this additional question if its screen or window we need a better way
+		var dowin = window.confirm("Do you want to share an application window?  If not you can share an entire screen.");
 
-	if (useVideo && obj.options.useCamera && obj.options.useCamera !== "none") {
-	    if (!video.optional) {
-		video.optional = [];
+		video = {
+		    width: {min: obj.options.videoParams.minWidth, max: obj.options.videoParams.maxWidth},
+		    height: {min: obj.options.videoParams.minHeight, max: obj.options.videoParams.maxHeight},
+		    mediaSource: dowin ? "window" : "screen"
+		}
+	    } else {
+		var opt = [];
+		if (obj.options.useCamera) {
+		    opt.push({sourceId: obj.options.useCamera});
+		}
+		
+		if (bestFrameRate) {
+		    opt.push({minFrameRate: bestFrameRate});
+		    opt.push({maxFrameRate: bestFrameRate});
+		}
+		
+		video = {
+		    mandatory: obj.options.videoParams,
+		    optional: opt		
+		};
 	    }
-
-	    if (obj.options.useCamera !== "any") {
-		video.optional.push({sourceId: obj.options.useCamera});
-	    }
-
-	    if (bestFrameRate) {
-		video.optional.push({minFrameRate: bestFrameRate});
-		video.optional.push({maxFrameRate: bestFrameRate});
-	    }
-
 	} else {
-	    console.log("Camera Disabled");
-	    video = false;
-	    useVideo = false;
+
+	    video = {
+		//mandatory: obj.options.videoParams,
+		width: {min: obj.options.videoParams.minWidth, max: obj.options.videoParams.maxWidth},
+		height: {min: obj.options.videoParams.minHeight, max: obj.options.videoParams.maxHeight}
+	    };
+	    
+            
+	    
+	    var useVideo = obj.options.useVideo;
+
+	    if (useVideo && obj.options.useCamera && obj.options.useCamera !== "none") {
+		//if (!video.optional) {
+		//video.optional = [];
+		//}
+
+		
+		if (obj.options.useCamera !== "any") {
+		    //video.optional.push({sourceId: obj.options.useCamera});
+		    video.deviceId = obj.options.useCamera;
+		}
+
+		if (bestFrameRate) {
+		    //video.optional.push({minFrameRate: bestFrameRate});
+		    //video.optional.push({maxFrameRate: bestFrameRate});
+		    video.frameRate = {ideal: bestFrameRate, min: minFrameRate, max: 30};
+		}
+
+	    } else {
+		console.log("Camera Disabled");
+		video = false;
+		useVideo = false;
+	    }
 	}
 
 	return {audio: audio, video: video, useVideo: useVideo};
@@ -597,14 +586,12 @@
 	    self.localStream = stream;
 	    
 	    if (screen) {
-		if (moz) {
-		    self.constraints.OfferToReceiveVideo = false;
-		} else {
-		    self.constraints.mandatory.OfferToReceiveVideo = false;
-		}
+		self.constraints.offerToReceiveVideo = false;
+		self.constraints.offerToReceiveAudio = false;
+		self.constraints.offerToSendAudio = false;
 	    }
 	    
-            self.peer = RTCPeerConnection({
+            self.peer = FSRTCPeerConnection({
                 type: self.type,
                 attachStream: self.localStream,
                 onICE: function(candidate) {
@@ -646,12 +633,13 @@
             getUserMedia({
 		constraints: {
                     audio: mediaParams.audio,
-                video: mediaParams.video
+                    video: mediaParams.video
 		},
 		video: mediaParams.useVideo,
 		onsuccess: onSuccess,
 		onerror: onError
             });
+
 	} else {
 	    onSuccess(null);
 	}
@@ -671,57 +659,23 @@
     // 2013, @muazkh - github.com/muaz-khan
     // MIT License - https://www.webrtc-experiment.com/licence/
     // Documentation - https://github.com/muaz-khan/WebRTC-Experiment/tree/master/RTCPeerConnection
-    window.moz = !!navigator.mozGetUserMedia;
-
-    function RTCPeerConnection(options) {
+    
+    function FSRTCPeerConnection(options) {
 	var gathering = false, done = false;
-
-        var w = window,
-        PeerConnection = w.mozRTCPeerConnection || w.webkitRTCPeerConnection,
-        SessionDescription = w.mozRTCSessionDescription || w.RTCSessionDescription,
-        IceCandidate = w.mozRTCIceCandidate || w.RTCIceCandidate;
-	
-        var STUN = {
-            url: !moz ? 'stun:stun.l.google.com:19302' : 'stun:23.21.150.121'
-        };
-
-        var iceServers = null;
+	var config = {};
+        var default_ice = {
+	    urls: ['stun:stun.l.google.com:19302']
+	};
 
         if (options.iceServers) {
-            var tmp = options.iceServers;
-
-            if (typeof(tmp) === "boolean") {
-                tmp = null;
-            }
-
-            if (tmp && !(typeof(tmp) == "object" && tmp.constructor === Array)) {
-                console.warn("iceServers must be an array, reverting to default ice servers");
-                tmp = null;
-            }
-
-            iceServers = {
-                iceServers: tmp || [STUN]
-            };
-
-            if (!moz && !tmp) {
-                iceServers.iceServers = [STUN];
-            }
+            if (typeof(options.iceServers) === "boolean") {
+		config.iceServers = [default_ice];
+            } else {
+		config.iceServers = options.iceServers;
+	    }
         }
 
-        var optional = {
-            optional: []
-        };
-
-        if (!moz) {
-            optional.optional = [{
-                DtlsSrtpKeyAgreement: true
-            },
-            {
-                RtpDataChannels: options.onChannelMessage ? true : false
-            }];
-        }
-
-        var peer = new PeerConnection(iceServers, optional);
+        var peer = new window.RTCPeerConnection(config);
 
         openOffererChannel();
         var x = 0;
@@ -736,34 +690,10 @@
             }
 	    
             if (options.type == "offer") {
-                if ((!moz || (!options.sentICESDP && peer.localDescription.sdp.match(/a=candidate/)) && !x && options.onICESDP)) {
-                    options.onICESDP(peer.localDescription);
-                    //x = 1;
-                    /*
-                      x = 1;
-                      peer.createOffer(function(sessionDescription) {
-                      sessionDescription.sdp = serializeSdp(sessionDescription.sdp);
-                      peer.setLocalDescription(sessionDescription);
-                      if (options.onICESDP) {
-                      options.onICESDP(sessionDescription);
-                      }
-                      }, onSdpError, constraints);
-                    */
-                }
+                options.onICESDP(peer.localDescription);
             } else {
                 if (!x && options.onICESDP) {
                     options.onICESDP(peer.localDescription);
-                    //x = 1;
-                    /*
-                      x = 1;
-                      peer.createAnswer(function(sessionDescription) {
-                      sessionDescription.sdp = serializeSdp(sessionDescription.sdp);
-                      peer.setLocalDescription(sessionDescription);
-                      if (options.onICESDP) {
-                      options.onICESDP(sessionDescription);
-                      }
-                      }, onSdpError, constraints);
-                    */
                 }
             }
         }
@@ -811,7 +741,7 @@
             var remoteMediaStream = event.stream;
 
             // onRemoteStreamEnded(MediaStream)
-            remoteMediaStream.onended = function() {
+            remoteMediaStream.oninactive = function () {
                 if (options.onRemoteStreamEnded) options.onRemoteStreamEnded(remoteMediaStream);
             };
 
@@ -821,10 +751,10 @@
             //console.debug('on:add:stream', remoteMediaStream);
         };
 
-        var constraints = options.constraints || {
-	    offerToReceiveAudio: true,
-	    offerToReceiveVideo: true   
-        };
+        //var constraints = options.constraints || {
+	  //  offerToReceiveAudio: true,
+	    //offerToReceiveVideo: true   
+        //};
 
         // onOfferSDP(RTCSessionDescription)
         function createOffer() {
@@ -834,13 +764,8 @@
                 sessionDescription.sdp = serializeSdp(sessionDescription.sdp);
                 peer.setLocalDescription(sessionDescription);
                 options.onOfferSDP(sessionDescription);
-		/* old mozilla behaviour the SDP was already great right away */
-                if (moz && options.onICESDP && sessionDescription.sdp.match(/a=candidate/)) {
-                    options.onICESDP(sessionDescription);
-		    options.sentICESDP = 1;
-                }
             },
-            onSdpError, constraints);
+				onSdpError, options.constraints);
         }
 
         // onAnswerSDP(RTCSessionDescription)
@@ -848,7 +773,7 @@
             if (options.type != "answer") return;
 
             //options.offerSDP.sdp = addStereo(options.offerSDP.sdp);
-            peer.setRemoteDescription(new SessionDescription(options.offerSDP), onSdpSuccess, onSdpError);
+            peer.setRemoteDescription(new window.RTCSessionDescription(options.offerSDP), onSdpSuccess, onSdpError);
             peer.createAnswer(function(sessionDescription) {
                 sessionDescription.sdp = serializeSdp(sessionDescription.sdp);
                 peer.setLocalDescription(sessionDescription);
@@ -856,11 +781,11 @@
                     options.onAnswerSDP(sessionDescription);
                 }
             },
-            onSdpError, constraints);
+            onSdpError);
         }
 
-        // if Mozilla Firefox & DataChannel; offer/answer will be created later
-        if ((options.onChannelMessage && !moz) || !options.onChannelMessage) {
+
+        if ((options.onChannelMessage) || !options.onChannelMessage) {
             createOffer();
             createAnswer();
         }
@@ -899,9 +824,6 @@
         }
 
         function serializeSdp(sdp) {
-            //if (!moz) sdp = setBandwidth(sdp);
-            //sdp = getInteropSDP(sdp);
-            //console.debug(sdp);
             return sdp;
         }
 
@@ -909,29 +831,18 @@
         var channel;
 
         function openOffererChannel() {
-            if (!options.onChannelMessage || (moz && !options.onOfferSDP)) return;
+            if (!options.onChannelMessage) return;
 
             _openOffererChannel();
 
-            if (!moz) return;
-            navigator.mozGetUserMedia({
-                audio: true,
-                fake: true
-            },
-            function(stream) {
-                peer.addStream(stream);
-                createOffer();
-            },
-            useless);
+            return;
         }
 
         function _openOffererChannel() {
-            channel = peer.createDataChannel(options.channel || 'RTCDataChannel', moz ? {} : {
+            channel = peer.createDataChannel(options.channel || 'RTCDataChannel', {
                 reliable: false
             });
 
-            if (moz) channel.binaryType = 'blob';
-
             setChannelEvents();
         }
 
@@ -955,8 +866,6 @@
             };
         }
 
-        if (options.onAnswerSDP && moz && options.onChannelMessage) openAnswererChannel();
-
         function openAnswererChannel() {
             peer.ondatachannel = function(event) {
                 channel = event.channel;
@@ -964,16 +873,7 @@
                 setChannelEvents();
             };
 
-            if (!moz) return;
-            navigator.mozGetUserMedia({
-                audio: true,
-                fake: true
-            },
-            function(stream) {
-                peer.addStream(stream);
-                createAnswer();
-            },
-            useless);
+            return;
         }
 
         // fake:true is also available on chrome under a flag!
@@ -993,10 +893,10 @@
         return {
             addAnswerSDP: function(sdp, cbSuccess, cbError) {
 
-                peer.setRemoteDescription(new SessionDescription(sdp), cbSuccess ? cbSuccess : onSdpSuccess, cbError ? cbError : onSdpError);
+                peer.setRemoteDescription(new window.RTCSessionDescription(sdp), cbSuccess ? cbSuccess : onSdpSuccess, cbError ? cbError : onSdpError);
             },
             addICE: function(candidate) {
-                peer.addIceCandidate(new IceCandidate({
+                peer.addIceCandidate(new window.RTCIceCandidate({
                     sdpMLineIndex: candidate.sdpMLineIndex,
                     candidate: candidate.candidate
                 }));
@@ -1026,14 +926,14 @@
 
     // getUserMedia
     var video_constraints = {
-        mandatory: {},
-        optional: []
+        //mandatory: {},
+        //optional: []
     };
 
     function getUserMedia(options) {
         var n = navigator,
         media;
-        n.getMedia = n.webkitGetUserMedia || n.mozGetUserMedia;
+        n.getMedia = n.getUserMedia;
         n.getMedia(options.constraints || {
             audio: true,
             video: video_constraints
@@ -1044,15 +944,8 @@
         });
 
         function streaming(stream) {
-            //var video = options.video;
-            //var localVideo = options.localVideo;
-            //if (video) {
-              //  video[moz ? 'mozSrcObject' : 'src'] = moz ? stream : window.webkitURL.createObjectURL(stream);
-                //video.play();
-            //}
-
             if (options.localVideo) {
-                options.localVideo[moz ? 'mozSrcObject' : 'src'] = moz ? stream : window.webkitURL.createObjectURL(stream);
+                options.localVideo['src'] = window.URL.createObjectURL(stream);
 		options.localVideo.style.display = 'block';
             }
 
@@ -1080,7 +973,7 @@
 	var w = 0, h = 0;
 
 	for (var i in $.FSRTC.validRes) {
-	    if ($.FSRTC.validRes[i][0] > w && $.FSRTC.validRes[i][1] > h) {
+	    if ($.FSRTC.validRes[i][0] >= w && $.FSRTC.validRes[i][1] >= h) {
 		w = $.FSRTC.validRes[i][0];
 		h = $.FSRTC.validRes[i][1];
 	    }
@@ -1108,23 +1001,26 @@
 	}
 
 	var video = {
-            mandatory: {},
-            optional: []
+            //mandatory: {},
+            //optional: []
         }	
-
+	//FIXME
 	if (cam) {
-	    video.optional = [{sourceId: cam}];
+	    //video.optional = [{sourceId: cam}];
+	    video.deviceId = {exact: cam};
 	}
 	
 	w = resList[resI][0];
 	h = resList[resI][1];
 	resI++;
 
-	video.mandatory = {
-	    "minWidth": w,
-	    "minHeight": h,
-	    "maxWidth": w,
-	    "maxHeight": h
+	video = {
+	    width: {exact: w},
+	    height: {exact: h}
+	    //"minWidth": w,
+	    //"minHeight": h,
+	    //"maxWidth": w,
+	    //"maxHeight": h
 	};
 
 	getUserMedia({
@@ -1135,7 +1031,7 @@
 	    onsuccess: function(e) {
 		e.getTracks().forEach(function(track) {track.stop();});
 		console.info(w + "x" + h + " supported."); $.FSRTC.validRes.push([w, h]); checkRes(cam, func);},
-	    onerror: function(e) {console.error( w + "x" + h + " not supported."); checkRes(cam, func);}
+	    onerror: function(e) {console.warn( w + "x" + h + " not supported."); checkRes(cam, func);}
         });
     }
     
@@ -1170,6 +1066,7 @@
 		video: check_video,
 	    },
 	    onsuccess: function(e) {
+
 		e.getTracks().forEach(function(track) {track.stop();});
 		
 		console.info("media perm init complete"); 

html5/verto/js/src/jquery.jsonrpcclient.js

@@ -359,6 +359,11 @@
         return self._ws_socket ? true : false;
     };
 
+    $.JsonRpcClient.prototype.stopRetrying = function() {
+      if (self.to)
+        clearTimeout(self.to);
+    }
+
     $.JsonRpcClient.prototype._getSocket = function(onmessage_cb) {
         // If there is no ws url set, we don't have a socket.
         // Likewise, if there is no window.WebSocket.

html5/verto/js/src/jquery.verto.js

@@ -1298,6 +1298,14 @@
             this.modCommand("stop", null, "all");
         };
 
+        $.verto.conf.prototype.deaf = function(memberID) {
+            this.modCommand("deaf", parseInt(memberID));
+        };
+
+        $.verto.conf.prototype.undeaf = function(memberID) {
+            this.modCommand("undeaf", parseInt(memberID));
+        };
+
         $.verto.conf.prototype.record = function(file) {
             this.modCommand("recording", null, ["start", file]);
         };
@@ -1890,24 +1898,24 @@
     $.verto.dialog = function(direction, verto, params) {
         var dialog = this;
 
-        var tag = verto.options.tag;
-        if (typeof(tag) === "function") {
-            tag = tag();
-        }
-
         dialog.params = $.extend({
             useVideo: verto.options.useVideo,
             useStereo: verto.options.useStereo,
 	    screenShare: false,
-	    useCamera: verto.options.deviceParams.useCamera,
+	    useCamera: false,
 	    useMic: verto.options.deviceParams.useMic,
 	    useSpeak: verto.options.deviceParams.useSpeak,
-            tag: tag,
+            tag: verto.options.tag,
             localTag: verto.options.localTag,
             login: verto.options.login,
 	    videoParams: verto.options.videoParams
         }, params);
 	
+
+	if (!dialog.params.screenShare) {
+	    dialog.params.useCamera = verto.options.deviceParams.useCamera;
+	}
+
         dialog.verto = verto;
         dialog.direction = direction;
         dialog.lastState = null;
@@ -1925,6 +1933,10 @@
         } else {
             dialog.callID = dialog.params.callID = generateGUID();
         }
+
+	if (typeof(dialog.params.tag) === "function") {
+		dialog.params.tag = dialog.params.tag();
+	}
 	
         if (dialog.params.tag) {
             dialog.audioStream = document.getElementById(dialog.params.tag);
@@ -2012,7 +2024,7 @@
         RTCcallbacks.onStream = function(rtc, stream) {
             if (dialog.verto.options.permissionCallback &&
                 typeof dialog.verto.options.permissionCallback.onGranted === 'function'){
-                dialog.verto.options.permissionCallback.onGranted();
+                dialog.verto.options.permissionCallback.onGranted(stream);
             }
             console.log("stream started");
         };
@@ -2658,70 +2670,83 @@
     var checkDevices = function(runtime) {
 	console.info("enumerating devices");
 	var aud_in = [], aud_out = [], vid = [];	
+	var has_video = 0, has_audio = 0;
+	var Xstream;
 
-	if ((!navigator.mediaDevices || !navigator.mediaDevices.enumerateDevices) && MediaStreamTrack.getSources) {
-	    MediaStreamTrack.getSources(function (media_sources) {
-		for (var i = 0; i < media_sources.length; i++) {
+	function gotDevices(deviceInfos) {
+	      // Handles being called several times to update labels. Preserve values.
+	    for (var i = 0; i !== deviceInfos.length; ++i) {
+		var deviceInfo = deviceInfos[i];
+		var text = "";
 
-		    if (media_sources[i].kind == 'video') {
-			vid.push(media_sources[i]);
-		    } else {
-			aud_in.push(media_sources[i]);
-		    }
+		console.log(deviceInfo);
+		console.log(deviceInfo.kind + ": " + deviceInfo.label + " id = " + deviceInfo.deviceId);
+
+		if (deviceInfo.kind === 'audioinput') {
+		    text = deviceInfo.label || 'microphone ' + (aud_in.length + 1);
+		    aud_in.push({id: deviceInfo.deviceId, kind: "audio_in", label: text});
+		} else if (deviceInfo.kind === 'audiooutput') {
+		    text = deviceInfo.label || 'speaker ' + (aud_out.length + 1);
+		    aud_out.push({id: deviceInfo.deviceId, kind: "audio_out", label: text});
+		} else if (deviceInfo.kind === 'videoinput') {
+		    text = deviceInfo.label || 'camera ' + (vid.length + 1);
+		    vid.push({id: deviceInfo.deviceId, kind: "video", label: text});
+		} else {
+		    console.log('Some other kind of source/device: ', deviceInfo);
 		}
-		
-		$.verto.videoDevices = vid;
-		$.verto.audioInDevices = aud_in;
-		
-		console.info("Audio Devices", $.verto.audioInDevices);
-		console.info("Video Devices", $.verto.videoDevices);
-		runtime(true);
-	    });
-	} else {
-	    /* of course it's a totally different API CALL with different element names for the same exact thing */
-	    
-	    if (!navigator.mediaDevices || !navigator.mediaDevices.enumerateDevices) {
-		console.log("enumerateDevices() not supported.");
-		return;
 	    }
 
-	    // List cameras and microphones.
 
-	    navigator.mediaDevices.enumerateDevices()
-		.then(function(devices) {
-		    devices.forEach(function(device) {
-			console.log(device);
+	    $.verto.videoDevices = vid;
+	    $.verto.audioInDevices = aud_in;
+	    $.verto.audioOutDevices = aud_out;
+	    
+	    console.info("Audio IN Devices", $.verto.audioInDevices);
+	    console.info("Audio Out Devices", $.verto.audioOutDevices);
+	    console.info("Video Devices", $.verto.videoDevices);
 
-			console.log(device.kind + ": " + device.label +
-				    " id = " + device.deviceId);
-			
-			if (device.kind === "videoinput") {
-			    vid.push({id: device.deviceId, kind: "video", label: device.label});
-			} else if (device.kind === "audioinput") {
-			    aud_in.push({id: device.deviceId, kind: "audio_in", label: device.label});
-			} else if (device.kind === "audiooutput") {
-			    aud_out.push({id: device.deviceId, kind: "audio_out", label: device.label});
-			}
-		    });
-		    
+	    if (Xstream) {
+		Xstream.getTracks().forEach(function(track) {track.stop();});
+	    }
 
-		    $.verto.videoDevices = vid;
-		    $.verto.audioInDevices = aud_in;
-		    $.verto.audioOutDevices = aud_out;
-		    
-		    console.info("Audio IN Devices", $.verto.audioInDevices);
-		    console.info("Audio Out Devices", $.verto.audioOutDevices);
-		    console.info("Video Devices", $.verto.videoDevices);
-		    runtime(true);
-		    
-		})
-		.catch(function(err) {
-		    console.log(" Device Enumeration ERROR: " + err.name + ": " + err.message);
-		    runtime(false);
-		});
+	    if (runtime) {
+		runtime(true);
+	    }
 	}
 
-    };
+
+	
+
+	function handleError(error) {
+	    console.log('device enumeration error: ', error);
+	    if (runtime) runtime(false);
+	}
+
+
+	function checkTypes(devs) {
+	    for (var i = 0; i !== devs.length; ++i) {
+
+		if (devs[i].kind === 'audioinput') {
+		    has_audio++;
+		} else if (devs[i].kind === 'videoinput') {
+		    has_video++;
+		}
+	    }
+
+	    navigator.getUserMedia({ audio: (has_audio > 0 ? true : false), video: (has_video > 0 ? true : false)},
+				   function(stream) {
+				       Xstream = stream;
+				       navigator.mediaDevices.enumerateDevices().then(gotDevices).catch(handleError);
+				   },
+				   function(err) {
+				       console.log("The following error occurred: " + err.name);
+				   }
+				  );
+	}
+
+	navigator.mediaDevices.enumerateDevices().then(checkTypes).catch(handleError);
+
+  };
 
     $.verto.refreshDevices = function(runtime) {
 	checkDevices(runtime);

html5/verto/verto_communicator/bower.json

@@ -46,7 +46,7 @@
     "bootstrap-material-design": "~0.3.0",
     "angular-translate": "~2.10.0",
     "angular-translate-loader-static-files": "~2.10.0",
-    "angular-click-outside": "^2.8.3"
+    "angular-click-outside": "~2.9.2"
   },
   "resolutions": {
     "angular": "~1.3.15",

html5/verto/verto_communicator/src/css/verto.css

@@ -507,7 +507,6 @@ body .modal-body .btn-group .btn.active {
   max-height: calc(100% - 1vw);
   max-width: 146.78vh;
   margin: 7px auto;
-  position: absolute;
   top: 0;
   bottom: 0;
   left: 0;
@@ -1736,3 +1735,8 @@ body:-webkit-full-screen #incall .video-footer {
   color: rgba(0, 10, 66, 0.84);
   background-color: #E8E8E8;
 }
+
+#settings .loader {
+  width: 20px;
+  height: 20px;
+}

html5/verto/verto_communicator/src/index.html

@@ -108,6 +108,7 @@
     <script type="text/javascript" src="../js/src/jquery.jsonrpcclient.js"></script>
     <script type="text/javascript" src="../js/src/jquery.FSRTC.js"></script>
     <script type="text/javascript" src="../js/src/jquery.verto.js"></script>
+    <script type="text/javascript" src="../js/src/vendor/adapter-latest.js"></script>
 
     <script type="text/javascript" src="js/3rd-party/getScreenId.js"></script>
     <script type="text/javascript" src="js/3rd-party/md5.min.js"></script>

html5/verto/verto_communicator/src/locales/locale-en.json

@@ -124,6 +124,7 @@
   "AUTO_SPEED_RES": "Automatically determine speed and resolution settings",
   "RECHECK_BANDWIDTH": "Recheck bandwidth before each outgoing call",
   "CHECK_NETWORK_SPEED": "Check Network Speed",
+  "CHECKING_NETWORK_SPEED": "Checking Network Speed",
   "VIDEO_QUALITY": "Video quality:",
   "MAX_INCOMING_BANDWIDTH": "Max incoming bandwidth:",
   "MAX_OUTGOING_BANDWIDTH": "Max outgoing bandwidth:",
@@ -144,11 +145,15 @@
   "CHAT_TITLE_VOL_PLUS": "Volume +",
   "CHAT_TITLE_GAIN_MINUS": "Gain -",
   "CHAT_TITLE_GAIN_PLUS": "Gain +",
+  "CHAT_TITLE_DEAF_UNDEAF": "Deaf/Undeaf",
   "CHAT_VOL_MINUS": "Vol -",
   "CHAT_VOL_PLUS": "Vol +",
   "CHAT_GAIN_MINUS": "Gain -",
   "CHAT_GAIN_PLUS": "Gain +",
+  "CHAT_DEAF": "Deaf",
+  "CHAT_UNDEAF": "Undeaf",
   "LANGUAGE": "Language:",
   "BROWSER_LANGUAGE": "Browser Language",
-  "FACTORY_RESET_SETTINGS": "Factory Reset Settings"
+  "FACTORY_RESET_SETTINGS": "Factory Reset Settings",
+  "AUTOGAIN_CONTROL": "Auto Gain Control"
 }

html5/verto/verto_communicator/src/locales/locale-es.json

@@ -1,142 +1,159 @@
 {
-  "TITLE_ACTIVE_CALL": "Uy, llamada activa en curso.",
-  "MESSAGE_ACTIVE_CALL_HANGUP": "Parece que estas en una llamada, Desea colgar?",
-  "MESSAGE_ACTIVE_CALL_BACK": "Parece que estabas en una llamada la ultima vez, quieres regresar a eso?",
+  "TITLE_ACTIVE_CALL": "Llamada en curso.",
+  "MESSAGE_ACTIVE_CALL_HANGUP": "Estas en una llamada, ¿ quieres colgar ?",
+  "MESSAGE_ACTIVE_CALL_BACK": "Wstabas en una llamada la última vez, ¿ quieres retomarla ?",
   "TITLE_INCOMING_CALL": "Llamada entrante",
-  "MESSAGE_INCOMING_CALL": "Desde ",
-  "MESSAGE_NO_HANGUP_CALL": "No hay ninguna llamada que colgar.",
-  "MESSAGE_ENTER_FILENAME": "Por favor, indique el nombre del archivo.",
-  "TITLE_ENABLE_VIDEO": "¿Quieres activar el video para esta convocatoria?",
-  "MESSAGE_ENABLE_VIDEO": "Video estará activo durante las siguientes  llamadas.",
-  "TITLE_INSERT_BANNER": "Por favor introduzca el texto del estandarte ",
-  "TITLE_INSERT_CANVAS_ID": "Por favor, Introduzca el Id de lona",
-  "TITLE_INSERT_LAYER": "Por favor inserte la capa",
-  "TITLE_TRANSFER": "¿Transferencia de partido?",
-  "MESSAGE_TRANSFER": "¿A qué destino quieres transferir esta llamada?",
+  "MESSAGE_INCOMING_CALL": "desde ",
+  "MESSAGE_NO_HANGUP_CALL": "No hay llamada que colgar.",
+  "MESSAGE_ENTER_FILENAME": "Por favor, indica el nombre del archivo.",
+  "TITLE_ENABLE_VIDEO": "¿ Quieres activar el vídeo para esta llamada ?",
+  "MESSAGE_ENABLE_VIDEO": "El video estará activo durante las siguientes llamadas.",
+  "TITLE_INSERT_BANNER": "Por favor indica el texto para el banner",
+  "TITLE_INSERT_CANVAS_ID": "Por favor, indica el idenficador del lienzo",
+  "TITLE_INSERT_LAYER": "Por favor, indica el título para la capa",
+  "TITLE_TRANSFER": "¿ Transferir llamada ?",
+  "MESSAGE_TRANSFER": "¿ A qué destino quieres transferir esta llamada? ",
   "LABEL_TRANSFER": "Destino",
-  "MESSAGE_DISPLAY_SETTINGS": "No se puede mostrar la configuración durante una llamada",
+  "MESSAGE_DISPLAY_SETTINGS": "No se puede mostrar la configuración de vista previa durante una llamada",
   "BUTTON_END_CALL": "Finalizar llamada",
   "BUTTON_CLOSE": "Cerrar",
   "MESSAGE_PLAY": " Reproducir",
   "MESSAGE_STOP": "Parar",
   "MESSAGE_RECORD": "Grabar",
   "MESSAGE_STOP_RECORD": "Parar de grabar",
-  "MESSAGE_SNAPSHOT": "Foto instantánea",
+  "MESSAGE_SNAPSHOT": "Captura",
   "MESSAGE_VIDEO_MODE": "Modo de vídeo",
-  "MESSAGE_MUTE_MIC": "(des) silenciar el micrófono",
-  "MESSAGE_MUTE_VIDEO": "(des) silenciar el Video",
+  "MESSAGE_MUTE_MIC": "(des)activar el micrófono",
+  "MESSAGE_MUTE_VIDEO": "(des)activar el video",
   "MESSAGE_FULLSCREEN": "Cambiar el modo de pantalla completa",
   "MESSAGE_SCREENSHARE": "Compartir la pantalla",
-  "MESSAGE_OPEN_CLOSE_CHAT": "Abrir/cerrar Chat",
+  "MESSAGE_OPEN_CLOSE_CHAT": "Abrir/cerrar chat",
   "MESSAGE_SPEAKER": "Altavoz",
-  "MESSAGE_POPUP": "Emergente",
-  "CHAT_TITLE_MEMBERS": "Miembros",
+  "MESSAGE_POPUP": "Ventana emergente",
+  "CHAT_TITLE_MEMBERS": "Participantes",
   "CHAT_TITLE": "Chat",
-  "CHAT_NO_MEMBERS": "No hay miembros para mostrar.",
+  "CHAT_NO_MEMBERS": "No hay participantes para mostrar.",
   "CHAT_GENERAL": "General",
-  "CHAT_TITLE_KICK": "Patear",
-  "CHAT_KICK": "Patear",
-  "CHAT_TITLE_VIDEO_FLOOR": "Piso Video",
-  "CHAT_FLOOR": "Piso",
+  "CHAT_TITLE_KICK": "Expulsar",
+  "CHAT_KICK": "Expulsar",
+  "CHAT_TITLE_VIDEO_FLOOR": "Fondo de vídeo",
+  "CHAT_FLOOR": "Fondo de chat",
   "CHAT_TITLE_TRANSFER": "Transferir",
   "CHAT_TRANSFER": "Transferir",
-  "CHAT_BANNER": "Estandarte",
+  "CHAT_BANNER": "Banner",
   "CHAT_TITLE_SET": "Poner",
   "CHAT_SET": "Poner",
-  "CHAT_TITLE_RESET": "Reajustar",
-  "CHAT_RESET": "Reajustar ",
-  "CHAT_CANVAS": "Lona",
-  "CHAT_CANVAS_IN": "Lona dentro",
-  "CHAT_CANVAS_OUT": "Lona afuera",
-  "CHAT_PREV": "Prev",
-  "CHAT_NEXT": "Proximo",
+  "CHAT_TITLE_RESET": "Resetear",
+  "CHAT_RESET": "Resetear ",
+  "CHAT_CANVAS": "Lienzo",
+  "CHAT_CANVAS_IN": "Lienzo dentro",
+  "CHAT_CANVAS_OUT": "Lienzo afuera",
+  "CHAT_PREV": "Siguiente",
+  "CHAT_NEXT": "Próximo",
   "CHAT_LAYER": "Capa",
   "CHAT_AUDIO_VIDEO": "Audio/Video",
-  "CHAT_TITLE_MUTE_UNMUTE_MIC": "Silenciar/Des Silenciar Microfono",
+  "CHAT_TITLE_MUTE_UNMUTE_MIC": "Activar/desactivar micrófono",
   "CHAT_MUTE_MIC": "Silenciar ",
-  "CHAT_UNMUTE_MIC": "Des Silenciar",
-  "CHAT_TITLE_MUTE_UNMUTE_MIC": "Silenciar/Des Silenciar Video",
+  "CHAT_UNMUTE_MIC": "No silenciar",
+  "CHAT_TITLE_MUTE_UNMUTE_VIDEO": "Activar/desactivar vídeo",
   "CHAT_NO_MESSAGES": "No hay mensajes para mostrar.",
   "CHAT_SEND_MESSAGE": "Enviar",
-  "CHAT_TYPE_MESSAGE": "Escriba su mensaje aquí...",
-  "TITLE_CONTRIBUTORS": "Contribuyente",
+  "CHAT_TYPE_MESSAGE": "Escribe tu mensaje aquí...",
+  "TITLE_CONTRIBUTORS": "Colaboradores",
   "MESSAGE_CONNECTION_UNTRUSTED": "Esta conexión no es de confianza.",
   "MESSAGE_TOGGLE_NAVIGATION": "Alternar la navegación",
-  "BANDWIDTH_INFO": "Información de la amplitud de banda",
+  "BANDWIDTH_INFO": "Información de ancho de banda",
   "BANDWIDTH_INFO_INCOMING": "Entrante:",
   "BANDWIDTH_INFO_OUTGOING": "Saliente:",
   "BANDWIDTH_INFO_VIDEO_RES": "Resolución de vídeo:",
   "IN_CALL": "En llamada:",
-  "LAST_CALL": " Última llamada:",
-  "OPEN_NEW_WINDOW": "Abrir nueva Ventana",
+  "LAST_CALL": "Última llamada:",
+  "OPEN_NEW_WINDOW": "Abrir en ventana nueva",
   "CHANGE_LOGIN_INFO": "Cambiar la información de inicio de sesión",
-  "LOGOUT": "Salir de sesión",
-  "ABOUT": "Sobre",
+  "LOGOUT": "Cerrar sesión",
+  "ABOUT": "Acerca de",
   "HELP": "Ayuda",
-  "CONTRIBUTORS": "Contribuyente",
-  "TITLE_PREVIEW_SETTINGS": "Configuración de la Cámara y el Micrófono",
+  "CONTRIBUTORS": "Colaboradores",
+  "TITLE_PREVIEW_SETTINGS": "Configuración de la cámara y el micrófono",
   "CAMERA_SETTINGS": "Cámara:",
   "MIC_SETTINGS": "Micrófono:",
-  "SAVE": "Salvar",
+  "SAVE": "Guardar",
   "LOADING": "Cargando",
   "ERRORS" : "Errores",
   "CALLING_TO": "Llamar a ",
   "CANCELLING": "Cancelando...",
-  "DETERMINING_SPEED": "Determinación de la velocidad...",
+  "DETERMINING_SPEED": "Midiendo la velocidad...",
   "CALL_HISTORY": "Historial de llamadas",
   "CLEAR_CALL_HISTORY": "Borrar Historial",
-  "NO_CALL_HISTORY": "No Historial de llamadas.",
-  "ENTER_EXTENSION": "Entre en una extensión",
-  "CALL_EXTENSION": " Llamar extensión",
-  "LOGIN": "Inicio de Sesión",
-  "LOGIN_INFORMATION": "Información de Inicio de Sesión",
-  "SAVE_LOGIN_INFORMATION": "Salvar Información de Inicio de Sesión",
-  "INVALID_LOGIN_FIELDS": "Verifique los campos abajo e intente otra vez.",
+  "NO_CALL_HISTORY": "Sin historial de llamadas.",
+  "ENTER_EXTENSION": "Marca una extensión",
+  "CALL_EXTENSION": "Llamar a una extensión",
+  "LOGIN": "Inicio de sesión",
+  "LOGIN_INFORMATION": "Información de inicio de sesión",
+  "SAVE_LOGIN_INFORMATION": "Guardar información de inicio de sesión",
+  "INVALID_LOGIN_FIELDS": "Corrige el formulario e inténtalo otra vez.",
+  "INVALID_SETTINGS_FIELDS": "Verifica los ajustes e inténtalo otra vez.",
   "NAME": "Nombre",
-  "YOUR_NAME": "Su Nombre",
-  "EMAIL": " El Correo Electrónico",
-  "YOUR_EMAIL": "Su Correo Electrónico",
+  "YOUR_NAME": "Tu nombre",
+  "EMAIL": " Correo electrónico",
+  "YOUR_EMAIL": "Tu correo electrónico",
   "USER": "Usuario",
   "PASSWORD": "Contraseña",
-  "CALLER_ID": "Identificador de llamadas",
-  "HOSTNAME": "Hostname",
+  "CALLER_ID": "Identificador de llamada",
+  "HOSTNAME": "Servidor",
   "WEBSOCKET_URL": "Websocket URL",
-  "SETTINGS": "Configuraciónes",
-  "DEVICE_SETTINGS": "La configuración de usuario",
+  "SETTINGS": "Configuración",
+  "DEVICE_SETTINGS": "Configuración de dispositivo",
   "SHARE_DEVICE": "Compartir dispositivo",
   "SPEAKER": "Altavoz:",
-  "SPEAKER_FEATURE": "Su navegador no parece apoyar esta función",
-  "PREVIEW_SETTINGS": "Configuración de vista anticipada",
+  "SPEAKER_FEATURE": "Tu navegador no soporta esta característica",
+  "PREVIEW_SETTINGS": "Configuración de vista previa",
   "REFRESH_DEVICE_LIST": "Actualizar la lista de dispositivos",
   "GENERAL_SETTINGS": "Configuración general:",
   "USE_VIDEO": "Utilizar vídeo",
-  "USE_STEREO_AUDIO": "Audio Estéreo",
+  "USE_STEREO_AUDIO": "Utilizar audio estéreo",
   "USE_STUN": "Utilizar STUN",
-  "SCALE_VIDEO": "Escala de vídeo remoto para que coincida con la resolución de la cámara",
+  "SCALE_VIDEO": "Escalar el vídeo remoto para que coincida con la resolución de la cámara",
   "ASK_BEFORE_RECOVER": "Preguntar antes de recuperar la llamada",
-  "BEST_FRAME_RATE": "Mejor velocidad:",
+  "BEST_FRAME_RATE": "Mejor velocidad de vídeo:",
   "AUDIO_SETTINGS": "Configuración de audio:",
   "ECHO_CANCEL": "Cancelación de eco",
   "NOISE_SUPPRESSION": "Supresión de Ruido",
   "HIGHPASS_FILTER": "Filtro de paso alto",
   "VIDEO_SETTINGS":  "Configuración de vídeo:",
-  "REMOTE_ENCODER": "Codificador Remoto dedicado permitido.",
+  "REMOTE_ENCODER": "Codificador remoto  activado",
   "AUTO_SPEED_RES": "Determinar automáticamente la configuración de velocidad y resolución",
-  "RECHECK_BANDWIDTH": "Compruebe de nuevo la amplitud de banda antes de cada llamada saliente",
-  "CHECK_NETWORK_SPEED": "Compruebe la velocidad de la red",
-  "VIDEO_QUALITY": "Calidad de video:",
-  "MAX_INCOMING_BANDWIDTH": "Máxima amplitude banda entrante:",
-  "MAX_OUTGOING_BANDWIDTH": "Máxima amplitude banda saliente:",
-  "FACTORY_RESET": "Restablecimiento de fábrica",
-  "SAVE_DEVICE_SETTINGS": "Guardar la Configuración del dispositivo ",
-  "BROWSER_COMPATIBILITY": "Comprobar Compatibilidad de navegadores.",
-  "REFRESH_MEDIA_DEVICES": "Actualizar dispositivos de medios.",
+  "RECHECK_BANDWIDTH": "Volver a comprobar el ancho de banda antes de cada llamada saliente",
+  "CHECK_NETWORK_SPEED": "Comprobar la velocidad de la red",
+  "VIDEO_QUALITY": "Calidad de vídeo:",
+  "MAX_INCOMING_BANDWIDTH": "Máximo ancho banda entrante:",
+  "MAX_OUTGOING_BANDWIDTH": "Máximo ancho banda saliente:",
+  "FACTORY_RESET": "Reiniciar",
+  "SAVE_DEVICE_SETTINGS": "Guardar la configuración del dispositivo",
+  "BROWSER_COMPATIBILITY": "Comprobando la compatibilidad del navegador web",
+  "REFRESH_MEDIA_DEVICES": "Actualizando dispositivos multimedia",
   "BROWSER_WITHOUT_WEBRTC": "Error: el navegador no soporta WebRTC.",
-  "CHECK_PERMISSION_MEDIA": "Comprobación de permisos de los medios de comunicación",
-  "CHECK_PROVISIONING_CONF": "Aprovisionamiento de configuración.",
-  "CHECK_LOGIN": "Verifiicar inicio de sesión.",
-  "CHECK_CONNECTION_SPEED": " Verificar la velocidad de conexión.",
-  "ERROR_PERMISSION_MEDIA": "Error: permiso de medios negado",
+  "CHECK_PERMISSION_MEDIA": "Comprobando permisos de los dispositivos multimedia",
+  "CHECK_PROVISIONING_CONF": "Verificando configuración.",
+  "CHECK_LOGIN": "Verificando inicio de sesión.",
+  "CHECK_CONNECTION_SPEED": " Verificando la velocidad de conexión.",
+  "ERROR_PERMISSION_MEDIA": "Error: permiso de dispositivos multimedia denegado",
   "ERROR_PROVISIONING_CONF": "Error: Provisión falló.",
-  "PLEASE_WAIT": "Por favor espere..."
+  "PLEASE_WAIT": "Por favor espere...",
+  "CANCEL": "Cancelar",
+  "CHAT_TITLE_VOL_MINUS": "Volumen -",
+  "CHAT_TITLE_VOL_PLUS": "Volumen +",
+  "CHAT_TITLE_GAIN_MINUS": "Ganancia -",
+  "CHAT_TITLE_GAIN_PLUS": "Ganancia +",
+  "CHAT_TITLE_DEAF_UNDEAF": "Deaf/Undeaf",
+  "CHAT_VOL_MINUS": "Vol -",
+  "CHAT_VOL_PLUS": "Vol +",
+  "CHAT_GAIN_MINUS": "Gain -",
+  "CHAT_GAIN_PLUS": "Gain +",
+  "CHAT_DEAF": "Deaf",
+  "CHAT_UNDEAF": "Undeaf",
+  "LANGUAGE": "Idioma:",
+  "BROWSER_LANGUAGE": "Idioma del navegador",
+  "FACTORY_RESET_SETTINGS": "Inicializar ajustes",
+  "AUTOGAIN_CONTROL": "Control de ganancia automática"
 }

html5/verto/verto_communicator/src/locales/locale-pt.json

@@ -124,6 +124,7 @@
   "AUTO_SPEED_RES": "Determinar automaticamente velocidade e configurações de resolução",
   "RECHECK_BANDWIDTH": "Verificar novamente largura de banda antes de realizar cada chamada",
   "CHECK_NETWORK_SPEED": "Verificar velocidade da rede",
+  "CHECKING_NETWORK_SPEED": "Verificando velocidade da rede",
   "VIDEO_QUALITY": "Qualidade do vídeo:",
   "MAX_INCOMING_BANDWIDTH": "Largura de banda de entrada máxima:",
   "MAX_OUTGOING_BANDWIDTH": "Largura de banda de saída máxima:",
@@ -144,9 +145,13 @@
   "CHAT_TITLE_VOL_PLUS": "Volume +",
   "CHAT_TITLE_GAIN_MINUS": "Ganho -",
   "CHAT_TITLE_GAIN_PLUS": "Ganho +",
+  "CHAT_TITLE_DEAF_UNDEAF": "Ligar/Desligar Áudio",
   "CHAT_VOL_MINUS": "Vol -",
   "CHAT_VOL_PLUS": "Vol +",
   "CHAT_GAIN_MINUS": "Ganho -",
   "CHAT_GAIN_PLUS": "Ganho +",
-  "FACTORY_RESET_SETTINGS": "Redefinir configurações"
+  "CHAT_DEAF": "Ligar Áudio",
+  "CHAT_UNDEAF": "Desligar Áudio",
+  "FACTORY_RESET_SETTINGS": "Redefinir configurações",
+  "AUTOGAIN_CONTROL": "Controle de Ganho Automático (AGC)"
 }

html5/verto/verto_communicator/src/partials/chat.html

@@ -55,7 +55,7 @@
 
       <div class="admin-controls" ng-if="verto.data.confRole == 'moderator'" ng-show="$index == $parent.openId">
         <div>
-          <div class="col-md-6 ctrl-section">
+          <div class="col-md-12 ctrl-section">
             <h3>{{ 'CHAT_GENERAL' | translate }}</h3>
             <div class="group btn-group-justified">
               <a href="" class="btn btn-xs" ng-click="confKick(member.id)" title="{{ 'CHAT_TITLE_KICK' | translate }}">
@@ -70,6 +70,11 @@
                 <i class="mdi-fw mdi-communication-call-made"></i>
                 <span style="margin-left: -9px">{{ 'CHAT_TRANSFER' | translate }}</span>
               </a>
+
+              <a href="" class="btn btn-xs" ng-click="confToggleDeaf(member)" title="{{ 'CHAT_TITLE_DEAF_UNDEAF' | translate }}">
+                <i class="mdi-fw" ng-class="member.status.audio.deaf ? 'mdi-content-clear' : 'mdi-av-hearing'"></i>
+                {{ member.status.audio.deaf ? 'CHAT_UNDEAF' : 'CHAT_DEAF' | translate }}
+              </a>
             </div>
           </div>
 
@@ -188,7 +193,8 @@
     <div class="chat-message-input">
       <form ng-submit="send()" >
         <div class="chat-message-input-group">
-          <textarea ng-model="message" ng-keydown="($event.keyCode == 13 && $event.shiftKey !== true) && send($event)" required="required" class="form-control input-sm" placeholder="{{ 'CHAT_TYPE_MESSAGE' | translate }}"></textarea>
+          <textarea ng-model="message" ng-keydown="($event.keyCode == 13 && $event.shiftKey !== true) && send($event)" required="required" class="form-control input-sm" placeholder="{{ 'CHAT_TYPE_MESSAGE' | translate }}"
+          ng-focus="disableOnKeydownDtmf()" ng-blur="enableOnKeydownDtmf()"></textarea>
           <button class="btn btn-success btn-sm" type="submit">
             {{ 'CHAT_SEND_MESSAGE' | translate }}
             <span class="mdi-navigation-arrow-forward chat-message-input-group-icon-button"></span>

html5/verto/verto_communicator/src/partials/dialpad_widget.html

@@ -1,25 +1,25 @@
 <div class="panel panel-default shadow-z-2" ng-class="{'shadow-z-2': !call_history}">
       <form name="form">
         <div class="input-group dialpad-display">
-          <input name="dialpadnumber" type="text" class="form-control text-center" placeholder="" ng-model="dialpadNumber" />
+          <input name="dtmfHistory" type="text" class="form-control text-center" placeholder="" ng-model="dtmfHistory.value" />
         </div>
         <div class="panel-body">
           <div class="dialpad-numbers">
             <div class="row">
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(1)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(1)">
                   <h2 class="dialpad-number">1</h2>
                   <span class="dialpad-alpha">./@</span>
                 </a>
               </div>
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(2)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(2)">
                   <h2 class="dialpad-number">2</h2>
                   <span class="dialpad-alpha">ABC</span>
                 </a>
               </div>
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(3)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(3)">
                   <h2 class="dialpad-number">3</h2>
                   <span class="dialpad-alpha">DEF</span>
                 </a>
@@ -27,19 +27,19 @@
             </div>
             <div class="row">
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(4)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(4)">
                   <h2 class="dialpad-number">4</h2>
                   <span class="dialpad-alpha">GHI</span>
                 </a>
               </div>
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(5)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(5)">
                   <h2 class="dialpad-number">5</h2>
                   <span class="dialpad-alpha">JKL</span>
                 </a>
               </div>
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(6)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(6)">
                   <h2 class="dialpad-number">6</h2>
                   <span class="dialpad-alpha">MNO</span>
                 </a>
@@ -47,19 +47,19 @@
             </div>
             <div class="row">
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(7)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(7)">
                   <h2 class="dialpad-number">7</h2>
                   <span class="dialpad-alpha">PQRS</span>
                 </a>
               </div>
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(8)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(8)">
                   <h2 class="dialpad-number">8</h2>
                   <span class="dialpad-alpha">TUV</span>
                 </a>
               </div>
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(9)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(9)">
                   <h2 class="dialpad-number">9</h2>
                   <span class="dialpad-alpha">WXYZ</span>
                 </a>
@@ -67,19 +67,19 @@
             </div>
             <div class="row">
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf('*')">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget('*')">
                   <h2 class="dialpad-number dialpad-star">*</h2>
                   <span class="dialpad-alpha"></span>
                 </a>
               </div>
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf(0)">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget(0)">
                   <h2 class="dialpad-number">0</h2>
                   <span class="dialpad-alpha">+</span>
                 </a>
               </div>
               <div class="col-md-4 col-xs-4">
-                <a class="btn btn-block" href="" ng-click="dtmf('#')">
+                <a class="btn btn-block" href="" ng-click="dtmfWidget('#')">
                   <h2 class="dialpad-number dialpad-pound">#</h2>
                   <span class="dialpad-alpha"></span>
                 </a>

html5/verto/verto_communicator/src/partials/modal_logininfo.html

@@ -2,22 +2,22 @@
   <h3 class="modal-title">{{ 'LOGIN_INFORMATION' | translate}}</h3>
 </div>
 <div class="modal-body">
-
-  <div class="form-group">
-    <label for="name">{{ 'NAME' | translate}}</label>
-    <input type="text" name="name" class="form-control" ng-model="storage.data.name" ng-value="storage.data.name"/>
+<form name="form" class="css-form" novalidate>
+  <div class="form-group {{ (((!form.name.$pristine || form.$submitted) && !form.name.$valid) ? 'has-error': '') }}">
+    <label class="control-label" for="name">{{ 'NAME' | translate}}</label>
+    <input type="text" name="name" class="form-control" id="login-name" placeholder="{{ 'YOUR_NAME' | translate}}" required="" ng-model="verto.data.name" autofocus>
   </div>
-  
-  <div class="form-group">
-    <label for="email">{{ 'EMAIL' | translate}}</label>
-    <input type="text" name="email" class="form-control" ng-model="storage.data.email" ng-value="storage.data.email"/>
+
+  <div class="form-group {{ (((!form.email.$pristine || form.$submitted) && !form.email.$valid) ? 'has-error': '') }}">
+    <label class="control-label" for="login-email">{{ 'EMAIL' | translate }}</label>
+    <input type="email" name="email" class="form-control" id="login-email" placeholder="{{ 'YOUR_EMAIL' | translate}}" ng-model="verto.data.email">
   </div>
 
   <div class="form-group">
     <label class="control-label" for="user">{{ 'USER' | translate}}</label>
     <input type="text" class="form-control" id="user" placeholder="User" ng-model="storage.data.login">
   </div>
-  
+
   <div class="form-group">
     <label class="control-label" for="password">{{ 'PASSWORD' | translate}}</label>
     <input type="password" class="form-control" id="password" placeholder="Password" ng-model="verto.data.password">
@@ -27,7 +27,7 @@
     <label class="control-label" for="callerid">{{ 'CALLER_ID' | translate}}</label>
     <input type="text" class="form-control" id="callerid" placeholder="Caller ID" ng-model="verto.data.callerid">
   </div>
-
+</form>
 </div>
 <div class="modal-footer">
   <!-- <button class="btn btn-primary" ng-click="cancel()">Cancel</button> -->

html5/verto/verto_communicator/src/partials/preview.html

@@ -7,7 +7,7 @@
       <div class="panel-body">
         <div class="preview-wrapper">
           <video id="videopreview" muted autoplay style="width: 100%;"></video>
-          <div id="mic-meter">
+          <div id="mic-meter" ng-if="audioContext">
             <div class="volumes">
               <div class="volume-segment"></div>
               <div class="volume-segment"></div>

html5/verto/verto_communicator/src/partials/settings.html

@@ -1,4 +1,4 @@
-<div id="settings" ng-controller="SettingsController" click-outside="$parent.closeSettings()">
+<div id="settings" ng-controller="SettingsController" click-outside="$parent.closeSettings()" outside-if-not="mdi-action-settings">
   <div class="content">
     <div class="col-md-4">
 
@@ -107,6 +107,12 @@
               <span ng-bind="'HIGHPASS_FILTER' | translate"></span>
             </label>
           </div>
+          <div class="checkbox">
+            <label>
+              <input type="checkbox" name="googAutoGainControl" value="mydata.googAutoGainControl" ng-model="mydata.googAutoGainControl">
+              <span ng-bind="'AUTOGAIN_CONTROL' | translate"></span>
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -129,11 +135,24 @@
           </label>
         </div>
 
-        <div class="checkbox" ng-show="mydata.autoBand">
-          <label>
-            <input type="checkbox" ng-model="mydata.testSpeedJoin">
-            <span ng-bind="'RECHECK_BANDWIDTH' | translate"></span>
-          </label>
+        <div ng-show="mydata.autoBand">
+          <div class="checkbox">
+            <label>
+              <input type="checkbox" ng-model="mydata.testSpeedJoin">
+              <span ng-bind="'RECHECK_BANDWIDTH' | translate"></span>
+            </label>
+          </div>
+
+          <a class="btn btn-primary" href="" ng-disabled="isTestingSpeed" ng-click="testSpeed()">
+            {{ isTestingSpeed ? 'CHECKING_NETWORK_SPEED' : 'CHECK_NETWORK_SPEED' | translate }}
+          </a>
+
+          <div>
+            <span ng-bind="speedMsg"></span>
+            <span ng-show="isTestingSpeed">
+              <img class="loader" src="src/images/ajax-loader.gif"/>
+            </span>
+          </div>
         </div>
 
         <a ng-show="mydata.autoBand" class="btn btn-primary" href="" ng-click="testSpeed()">{{ 'CHECK_NETWORK_SPEED' | translate }}</a> <span ng-bind="speedMsg"></span>

html5/verto/verto_communicator/src/partials/video_call.html

@@ -99,6 +99,9 @@
           </div>
         </div>
         <div class="col-md-6 col-xs-6 text-right">
+          <button ng-if="!verto.data.conf" tooltips="" tooltip-title="Hold" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-900" ng-click="hold()">
+            <i class="big-icon" ng-class="{'mdi-av-pause':!storage.data.onHold, 'mdi-av-play-arrow': storage.data.onHold}"></i>
+          </button>
           <button class="btn btn-danger" ng-click="hangup()" translate>
             <i class="mdi-communication-call-end"></i>
             {{ watcher ? 'BUTTON_CLOSE' : 'BUTTON_END_CALL' }}

html5/verto/verto_communicator/src/partials/ws_reconnect.html

@@ -2,7 +2,7 @@
 <h3 class="modal-title">Waiting for server reconnection.</h3>
 </div>
 <div class="modal-body">
-  
+  <a href="#/login" ng-click="closeReconnect()" class="btn btn-success">Change Server</a>
 </div>
 <div class="modal-footer">
 </div>

html5/verto/verto_communicator/src/storageService/services/splash_screen.js

@@ -14,11 +14,7 @@
               'status': 'success',
               'message': $translate.instant('BROWSER_COMPATIBILITY')
             };
-            navigator.getUserMedia = navigator.getUserMedia ||
-              navigator.webkitGetUserMedia ||
-              navigator.mozGetUserMedia;
-
-            if (!navigator.getUserMedia) {
+            if (!navigator.mediaDevices.getUserMedia) {
               result['status'] = 'error';
               result['message'] = $translate.instant('BROWSER_WITHOUT_WEBRTC');
               reject(result);
@@ -147,6 +143,8 @@
                * not connecting prevent two connects
                */
               if (storage.data.ui_connected && storage.data.ws_connected && !verto.data.connecting) {
+                verto.data.hostname = storage.data.hostname || verto.data.hostname;
+                verto.data.wsURL = storage.data.wsURL || verto.data.wsURL;
                 verto.data.name = storage.data.name;
                 verto.data.email = storage.data.email;
                 verto.data.login = storage.data.login;

html5/verto/verto_communicator/src/storageService/services/storage.js

@@ -23,6 +23,7 @@
           mutedMic: false,
           preview: true,
           selectedVideo: null,
+          selectedVideoName: null,
           selectedAudio: null,
           selectedShare: null,
           selectedSpeaker: null,
@@ -37,6 +38,7 @@
           googNoiseSuppression: true,
           googHighpassFilter: true,
           googEchoCancellation: true,
+          googAutoGainControl: true,
           autoBand: true,
           testSpeedJoin: true,
           bestFrameRate: "15",

html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js

@@ -333,6 +333,18 @@
         });
       };
 
+      $scope.confToggleDeaf = function(member) {
+        if(verto.data.confRole == 'moderator') {
+          console.log('$scope.confToggleDeaf');
+
+          if (member.status.audio.deaf) {
+            verto.data.conf.undeaf(member.id);
+          } else {
+            verto.data.conf.deaf(member.id);
+          }
+        }
+      };
+
       function shortPrompt(text, cb) {
         prompt({
           title: text,

html5/verto/verto_communicator/src/vertoControllers/controllers/DialPadController.js

@@ -4,8 +4,8 @@
   angular
     .module('vertoControllers')
     .controller('DialPadController', ['$rootScope', '$scope',
-      '$http', '$location', 'toastr', 'verto', 'storage', 'CallHistory', 'eventQueue',
-      function($rootScope, $scope, $http, $location, toastr, verto, storage, CallHistory, eventQueue) {
+      '$http', '$location', 'toastr', 'verto', 'storage', 'CallHistory', 'eventQueue', '$timeout',
+      function($rootScope, $scope, $http, $location, toastr, verto, storage, CallHistory, eventQueue, $timeout) {
         console.debug('Executing DialPadController.');
 
         eventQueue.process();

html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js

@@ -4,9 +4,11 @@
   angular
     .module('vertoControllers')
     .controller('MainController',
-      function($scope, $rootScope, $location, $modal, $timeout, $q, verto, storage, CallHistory, toastr, Fullscreen, prompt, eventQueue, $translate) {
+      function($scope, $rootScope, $location, $modal, $timeout, $q, verto, storage, CallHistory, toastr, Fullscreen, prompt, eventQueue, $translate, $window) {
 
       console.debug('Executing MainController.');
+      $rootScope.dtmfHistory = { value: '' };
+      $rootScope.onKeydownDtmfEnabled = true;
 
       if (storage.data.language && storage.data.language !== 'browser') {
         $translate.use(storage.data.language);
@@ -77,6 +79,8 @@
           $scope.$apply(function() {
           verto.data.connecting = false;
           if (connected) {
+            storage.data.hostname = verto.data.hostname;
+            storage.data.wsURL = verto.data.wsURL;
             storage.data.ui_connected = verto.data.connected;
             storage.data.ws_connected = verto.data.connected;
             storage.data.name = verto.data.name;
@@ -198,10 +202,10 @@
       $rootScope.$on('ws.close', onWSClose);
       $rootScope.$on('ws.login', onWSLogin);
 
-      var ws_modalInstance;
+      $rootScope.ws_modalInstance;
 
       function onWSClose(ev, data) {
-        if(ws_modalInstance) {
+        if($rootScope.ws_modalInstance) {
           return;
         };
         var options = {
@@ -209,7 +213,7 @@
           keyboard: false
         };
           if ($scope.showReconnectModal) {
-            ws_modalInstance = $scope.openModal('partials/ws_reconnect.html', 'ModalWsReconnectController', options);
+            $rootScope.ws_modalInstance = $scope.openModal('partials/ws_reconnect.html', 'ModalWsReconnectController', options);
           };
       };
 
@@ -217,12 +221,12 @@
         if(storage.data.autoBand) {
           verto.testSpeed();
         }
-        if(!ws_modalInstance) {
+        if(!$rootScope.ws_modalInstance) {
           return;
         };
 
-        ws_modalInstance.close();
-        ws_modalInstance = null;
+        $rootScope.ws_modalInstance.close();
+        $rootScope.ws_modalInstance = null;
       };
 
       $scope.showAbout = function() {
@@ -239,7 +243,8 @@
        * @param {String} number - New touched number.
        */
       $rootScope.dtmf = function(number) {
-        $rootScope.dialpadNumber = $scope.dialpadNumber + number;
+        console.log('dtmf', number);
+        $rootScope.dialpadNumber = $rootScope.dialpadNumber + number;
         if (verto.data.call) {
           verto.dtmf(number);
         }
@@ -555,6 +560,38 @@
         }
       }
 
+      $rootScope.dtmfWidget = function(number) {
+        $rootScope.dtmfHistory.value = $rootScope.dtmfHistory.value + number;
+        if (verto.data.call) {
+          verto.dtmf(number);
+        }
+      }
+
+      $rootScope.disableOnKeydownDtmf = function() {
+        $rootScope.onKeydownDtmfEnabled = false;
+      };
+
+      $rootScope.enableOnKeydownDtmf = function() {
+        $rootScope.onKeydownDtmfEnabled = true;
+      };
+
+      $rootScope.$on("$routeChangeStart", function(event, next, current) {
+        if (next.$$route.originalPath === '/incall') {
+          $rootScope.dtmfHistory.value = '';
+          angular.element($window).bind('keydown', onKeydownDtmfHistory);
+        } else {
+          angular.element($window).unbind('keydown', onKeydownDtmfHistory);
+        }
+      });
+
+      function onKeydownDtmfHistory(event) {
+        var caracter = event.key;
+        if ($rootScope.onKeydownDtmfEnabled && caracter.match(/^(\*|\#|[0-9a-dA-D])$/g)) {
+          $rootScope.dtmfWidget(caracter);
+          $scope.$applyAsync();
+        }
+      }
+
     }
   );
 

html5/verto/verto_communicator/src/vertoControllers/controllers/ModalLoginInformationController.js

@@ -19,7 +19,10 @@
           $modalInstance.dismiss('cancel');
         };
 
+        verto.data.name = storage.data.name;
+        verto.data.email = storage.data.email;
+
       }
     ]);
-    
-})();
+
+})();

html5/verto/verto_communicator/src/vertoControllers/controllers/ModalWsReconnectController.js

@@ -5,10 +5,20 @@
     .module('vertoControllers')
     .controller('ModalWsReconnectController', ModalWsReconnectController);
 
-    ModalWsReconnectController.$inject = ['$scope', 'storage', 'verto'];
+    ModalWsReconnectController.$inject = ['$rootScope', '$scope', 'storage', 'verto'];
 
-    function ModalWsReconnectController($scope, storage, verto) {
+    function ModalWsReconnectController($rootScope, $scope, storage, verto) {
       console.debug('Executing ModalWsReconnectController'); 
+
+      $scope.closeReconnect = closeReconnect;
+
+      function closeReconnect() {
+        if ($rootScope.ws_modalInstance && verto.data.instance) {
+          verto.data.instance.rpcClient.stopRetrying();
+          $rootScope.ws_modalInstance.close();
+          delete verto.data.instance;
+        }
+      };
     };
                 
                 

html5/verto/verto_communicator/src/vertoControllers/controllers/PreviewController.js

@@ -11,7 +11,10 @@
         $scope.storage = storage;
         console.debug('Executing PreviewController.');
         var localVideo = document.getElementById('videopreview');
-        var volumes = document.querySelector('#mic-meter .volumes').children;
+        var volumes = document.querySelector('#mic-meter .volumes');
+        if (volumes) {
+          volumes = volumes.children;
+        }
 
         $scope.localVideo = function() {
           var constraints = {
@@ -31,10 +34,13 @@
 
           });
         };
+        var audioContext = null;
+        if (typeof AudioContext !== "undefined") {
+          audioContext = new AudioContext();
+        }
 
-        var audioContext = new AudioContext();
         var mediaStreamSource = null;
-        var meter;
+        var meter = null;
         var streamObj = {};
 
         function stopMedia(stream) {
@@ -55,13 +61,12 @@
           }
 
           streamObj = stream;
-          localVideo.src = window.URL.createObjectURL(stream);
-
-          mediaStreamSource = audioContext.createMediaStreamSource(stream);
-          meter = createAudioMeter(audioContext);
-          mediaStreamSource.connect(meter);
-
-          renderMic();
+          FSRTCattachMediaStream(localVideo, stream);
+          if (audioContext) {
+            mediaStreamSource = audioContext.createMediaStreamSource(stream);
+            meter = createAudioMeter(audioContext);
+            mediaStreamSource.connect(meter);
+          };
         }
 
         function renderMic() {
@@ -109,8 +114,10 @@
 
         $scope.endPreview = function() {
           localVideo.src = null;
-          meter.shutdown();
-          meter.onaudioprocess = null;
+          if (audioContext) {
+            meter.shutdown();
+            meter.onaudioprocess = null;
+          };
           stopMedia(streamObj);
           $location.path('/dialpad');
           storage.data.preview = false;

html5/verto/verto_communicator/src/vertoControllers/controllers/SettingsController.js

@@ -33,6 +33,15 @@
         });
 
         $scope.ok = function() {
+          console.log('Camera Selected is', $scope.mydata.selectedVideo, $scope.verto.data.videoDevices);
+
+          angular.forEach(verto.data.videoDevices, function(video) {
+            console.log('checking video ', video);
+            if (video.id == $scope.mydata.selectedVideo) {
+              $scope.mydata.selectedVideoName = video.label;
+              console.log('Setting selectedVideoName to ', video.label);
+            }
+          })
           if ($scope.mydata.selectedSpeaker != storage.data.selectedSpeaker) {
             $rootScope.$emit('changedSpeaker', $scope.mydata.selectedSpeaker);
           }
@@ -75,11 +84,13 @@
         };
 
         $scope.testSpeed = function() {
+          $scope.isTestingSpeed = true;
           return verto.testSpeed(cb);
 
           function cb(data) {
             $scope.mydata.vidQual = storage.data.vidQual;
             $scope.speedMsg = 'Up: ' + data.upKPS + ' Down: ' + data.downKPS;
+            $scope.isTestingSpeed = false;
             $scope.$apply();
           }
         };

html5/verto/verto_communicator/src/vertoControllers/controllers/SplashScreenController.js

@@ -74,7 +74,7 @@
       $rootScope.$on('progress.complete', function(ev, current_progress) {
         $scope.message = 'Complete';
         if(verto.data.connected) {
-          if (storage.data.preview) {
+          if (0 && storage.data.preview) {
             $location.path('/preview');
           }
           else {

html5/verto/verto_communicator/src/vertoDirectives/directives/videoTag.js

@@ -13,17 +13,35 @@
   .module('vertoDirectives')
   .directive('videoTag',
   function() {
+
     function link(scope, element, attrs) {
       // Moving the video tag to the new place inside the incall page.
       console.log('Moving the video to element.');
-      jQuery('video').removeClass('hide').appendTo(element);
-      jQuery('video').css('display', 'block');
+      var videoElem = jQuery('#webcam');
+
+      var newParent = document.getElementsByClassName('video-tag-wrapper');
+	newParent[0].appendChild(document.getElementById('webcam'));
+
+	$("#webcam").resize(function() {
+	    updateVideoSize();
+	});
+
+	$(window).resize(function() {
+	    updateVideoSize();
+	});
+
+	updateVideoSize();
+	
+	videoElem.removeClass('hide');
+	videoElem.css('display', 'block');
+
       scope.callActive("", {useVideo: true});
 
       element.on('$destroy', function() {
         // Move the video back to the body.
         console.log('Moving the video back to body.');
-        jQuery('video').addClass('hide').appendTo(jQuery('body'));
+        videoElem.addClass('hide').appendTo(jQuery('body'));
+        $(window).unbind('resize');
       });
     }
 

html5/verto/verto_communicator/src/vertoService/services/vertoService.js

@@ -113,6 +113,35 @@ var framerate = [{
   label: '30 FPS'
 }, ];
 
+var updateReq;
+
+var updateVideoSize = function(ms) {
+    if (!ms) ms = 500;
+    
+    clearTimeout(updateReq);
+    updateReq = setTimeout(function () {
+        var videoElem = jQuery('#webcam');
+        videoElem.width("");
+        videoElem.height("");
+	
+        var w = videoElem.width();
+        var h = videoElem.height();
+        var new_w, new_h;
+        var aspect = 1920 / 1080;
+        var videoContainer = jQuery('div.video-wrapper');
+        if (w > h) {
+            new_w = videoContainer.width();
+            new_h = Math.round(videoContainer.width() / aspect);
+        } else {
+            new_h = videoContainer.height();
+            new_w = Math.round(videoContainer.height() / aspect);
+        }
+        videoElem.width(new_w);
+        videoElem.height(new_h);
+        console.log('Setting video size to ' + new_w + '/' + new_h);
+    }, ms);
+}
+
 var vertoService = angular.module('vertoService', ['ngCookies']);
 
 vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'storage',
@@ -234,7 +263,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
           id: 'screen',
           label: 'Screen'
         }];
-        data.audioDevices = [];
+        data.audioDevices = [{
+          id: 'none',
+          label: 'No Microphone'
+        }];
         data.speakerDevices = [];
 
         if(!storage.data.selectedShare) {
@@ -317,7 +349,13 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
 
         // Verify if selected devices are valid
         var videoFlag = data.videoDevices.some(function(device) {
-          return device.id == storage.data.selectedVideo;
+          console.log('Evaluating device ', device);
+          if (device.label == storage.data.selectedVideoName) {
+            console.log('Matched video selection by name: ', device.label);
+            storage.data.selectedVideo = device.id;
+            return true;
+          }
+          return device.id == storage.data.selectedVideo && storage.data.selectedVideo !== "none";
         });
 
         var shareFlag = data.shareDevices.some(function(device) {
@@ -332,7 +370,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
           return device.id == storage.data.selectedSpeaker;
         });
 
-        if (!videoFlag) storage.data.selectedVideo = data.videoDevices[0].id;
+        console.log('Storage Video: ', storage.data.selectedVideo);
+        console.log('Video Flag: ', videoFlag)
+
+        if (!videoFlag) storage.data.selectedVideo = data.videoDevices[data.videoDevices.length - 1].id;
         if (!shareFlag) storage.data.selectedShare = data.shareDevices[0].id;
         if (!audioFlag) storage.data.selectedAudio = data.audioDevices[0].id;
         if (!speakerFlag && data.speakerDevices.length > 0) storage.data.selectedSpeaker = data.speakerDevices[0].id;
@@ -484,7 +525,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
 
           data.liveArray.onChange = function(obj, args) {
             // console.log('liveArray.onChange', obj, args);
-
             switch (args.action) {
               case 'bootObj':
                 $rootScope.$emit('members.boot', args.data);
@@ -560,6 +600,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
 			  console.log("conference-liveArray-join");
 			  stopConference();
 			  startConference(v, dialog, params.pvtData);
+			  updateVideoSize();
 		      }
                       break;
                     case "conference-liveArray-part":
@@ -578,6 +619,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
               case $.verto.enum.message.info:
                 var body = params.body;
                 var from = params.from_msg_name || params.from;
+                if (!body) {
+                  console.log('Received an empty body: ', params);
+                  return;
+                }
                 $rootScope.$emit('chat.newMessage', {
                   from: from,
                   body: body
@@ -616,6 +661,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
                 console.debug('Talking to:', d.cidString());
                 data.callState = 'active';
                 callActive(d.lastState.name, d.params);
+		updateVideoSize();
                 break;
               case "hangup":
                 console.debug('Call ended with cause: ' + d.cause);
@@ -659,7 +705,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
           // Checking if we have a failed connection attempt before
           // connecting again.
           if (data.instance && !data.instance.rpcClient.socketReady()) {
-            clearTimeout(data.instance.rpcClient.to);
+            data.instance.rpcClient.stopRetrying();
             data.instance.logout();
             data.instance.login();
             return;
@@ -672,9 +718,11 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
             ringFile: "sounds/bell_ring2.wav",
             // TODO: Add options for this.
             audioParams: {
-                googEchoCancellation: storage.data.googEchoCancellation || true,
-                googNoiseSuppression: storage.data.googNoiseSuppression || true,
-                googHighpassFilter: storage.data.googHighpassFilter || true
+                googEchoCancellation: storage.data.googEchoCancellation === undefined ? true : storage.data.googEchoCancellation,
+                googNoiseSuppression: storage.data.googNoiseSuppression === undefined ? true : storage.data.googNoiseSuppression,
+                googHighpassFilter: storage.data.googHighpassFilter === undefined ? true : storage.data.googHighpassFilter,
+                googAutoGainControl: storage.data.googAutoGainControl === undefined ? true : storage.data.googAutoGainControl,
+                googAutoGainControl2: storage.data.googAutoGainControl === undefined ? true : storage.data.googAutoGainControl
             },
             sessid: sessid,
             iceServers: storage.data.useSTUN
@@ -695,7 +743,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
             onResCheck: that.refreshVideoResolution
           });
         }
-
         if (data.mediaPerm) {
           ourBootstrap();
         } else {
@@ -775,33 +822,85 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
         data.mutedMic = false;
         data.mutedVideo = false;
 
-        this.refreshDevices();
-
         if (angular.isFunction(callback)) {
           callback(data.instance, call);
         }
       },
 
       screenshare: function(destination, callback) {
-        console.log('share screen video');
 
-        var that = this;
+	  
+          var that = this;
+	  
+	  if (storage.data.selectedShare !== "screen") {
 
-        getScreenId(function(error, sourceId, screen_constraints) {
+              console.log('share screen from device ' + storage.data.selectedShare);
+
+	      var call = data.instance.newCall({
+		  destination_number: destination + "-screen",
+		  caller_id_name: data.name + " (Screen)",
+		  caller_id_number: data.login + " (screen)",
+		  outgoingBandwidth: storage.data.outgoingBandwidth,
+		  incomingBandwidth: storage.data.incomingBandwidth,
+		  useCamera: storage.data.selectedShare,
+		  useVideo: true,
+		  screenShare: true,
+		  dedEnc: storage.data.useDedenc,
+		  mirrorInput: storage.data.mirrorInput,
+		  userVariables: {
+		      email : storage.data.email,
+		      avatar: "http://gravatar.com/avatar/" + md5(storage.data.email) + ".png?s=600"
+		  }
+	      });
+
+              // Override onStream callback in $.FSRTC instance
+              call.rtc.options.callbacks.onStream = function(rtc, stream) {
+		  if(stream) {
+		      var StreamTrack = stream.getVideoTracks()[0];
+		      StreamTrack.addEventListener('ended', stopSharing);
+		      // (stream.getVideoTracks()[0]).onended = stopSharing;
+		  }
+		  
+		  console.log("screenshare started");
+		  
+		  function stopSharing() {
+		      if(that.data.shareCall) {
+			  that.screenshareHangup();
+			  console.log("screenshare ended");
+		      }
+		  }
+              };
+	      
+              data.shareCall = call;
+	      
+              console.log('shareCall', data);
+	      
+              data.mutedMic = false;
+              data.mutedVideo = false;
+	      
+              that.refreshDevices();
+	      
+	      return;
+	  }
+
+
+        console.log('share screen from plugin ' + storage.data.selectedShare);
+
+        var screenfunc = function(error, sourceId, screen_constraints) {
 
           if(error) {
             $rootScope.$emit('ScreenShareExtensionStatus', error);
             return;
           }
 
-          var call = data.instance.newCall({
+          var share_call = data.instance.newCall({
             destination_number: destination + '-screen',
             caller_id_name: data.name + ' (Screen)',
             caller_id_number: data.login + ' (Screen)',
             outgoingBandwidth: storage.data.outgoingBandwidth,
             incomingBandwidth: storage.data.incomingBandwidth,
-            videoParams: screen_constraints.video.mandatory,
-            useVideo: storage.data.useVideo,
+            videoParams: screen_constraints ? screen_constraints.video.mandatory : {},
+            useVideo: true,
             screenShare: true,
             dedEnc: storage.data.useDedenc,
             mirrorInput: storage.data.mirrorInput,
@@ -812,7 +911,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
           });
 
           // Override onStream callback in $.FSRTC instance
-          call.rtc.options.callbacks.onStream = function(rtc, stream) {
+          share_call.rtc.options.callbacks.onStream = function(rtc, stream) {
             if(stream) {
               var StreamTrack = stream.getVideoTracks()[0];
               StreamTrack.addEventListener('ended', stopSharing);
@@ -829,16 +928,19 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
             }
           };
 
-          data.shareCall = call;
+          data.shareCall = share_call;
 
           console.log('shareCall', data);
 
           data.mutedMic = false;
           data.mutedVideo = false;
+        };
 
-          that.refreshDevices();
-
-        });
+	  if (!!navigator.mozGetUserMedia) {
+	      screenfunc();
+	  } else {
+              getScreenId(screenfunc);
+	  }
 
       },
 

html5/verto/video_demo/verto.js

@@ -101,14 +101,14 @@ function full_screen(name) {
 }
 
 $("#" + video_screen).resize(function(e) { 
-    console.log("video size changed to " + $("#" + video_screen).width() + "x" + $("#" + video_screen).height());
+    //console.log("video size changed to " + $("#" + video_screen).width() + "x" + $("#" + video_screen).height());
 
-    if ($("#" + video_screen).width() > $(window).width()) {
+    //if ($("#" + video_screen).width() > $(window).width()) {
 	//resize(false);
-	$("#" + video_screen).width("100%");
-	$("#" + video_screen).height("100%"); 
-    }
-
+	//$("#" + video_screen).width("100%");
+	//$("#" + video_screen).height("100%"); 
+    //}
+    real_size();
 });
 		   
 
@@ -128,13 +128,41 @@ function resize(up) {
 
 }
 
+
+$( window ).resize(function() {
+    real_size();
+});
+
 function real_size() {
 
+    
 
-    $("#" + video_screen).width("");
-    $("#" + video_screen).height("");
+    /* temasys hack */
+    setTimeout(function() {
+	$("#" + video_screen).width("");
+	$("#" + video_screen).height("");
+
+	var w = $("#" + video_screen).width();
+	var h = $("#" + video_screen).height();
+
+	var new_w;
+	var new_h;
+	var aspect = 1920 / 1080; /*temasys doesn't provide video width hack aspect to wide screen*/
+	
+	if (w > h) {
+	    new_w = window.innerWidth;
+	    new_h = Math.round(window.innerWidth / aspect);
+	} else {
+	    new_h = window.innerHeight;
+	    new_w = Math.round(window.innerHeight / aspect);
+	}
+
+	$("#" + video_screen).width(new_w);
+	$("#" + video_screen).height(new_h);
+    }, 500);
+	
+    console.log("video size changed to fit screen");
 
-    console.log("video size changed to natural default");
 
 }
 
@@ -202,8 +230,19 @@ function check_vid() {
     return use_vid;
 }
 
+var DISABLE_SPEED_TEST = true;
+
 function do_speed_test(fn)
 {
+
+  
+    if (DISABLE_SPEED_TEST) {
+	if (fn) {
+	    fn();
+	}
+	return;
+    }
+
     goto_page("bwtest");
 
     vertoHandle.rpcClient.speedTest(1024 * 256, function(e, obj) {
@@ -486,6 +525,7 @@ var callbacks = {
 	    check_vid_res();
 
             $("#ansbtn").click(function() {
+		console.error("WTF", cur_call, d);
                 cur_call.answer({
 		    useStereo: $("#use_stereo").is(':checked'),
 		    callee_id_name: $("#cidname").val(),
@@ -548,7 +588,7 @@ var callbacks = {
 	    }
 
             goto_page("incall");
-
+	    real_size();
             break;
         case $.verto.enum.state.hangup:
 	    $("#main_info").html("Call ended with cause: " + d.cause);
@@ -868,7 +908,7 @@ function doshare(on) {
 
 
     console.log("Attempting Screen Capture....");
-    getScreenId(function (error, sourceId, screen_constraints) {
+    var sharefunc = function(error, sourceId, screen_constraints) {
 	
 
 
@@ -878,15 +918,22 @@ function doshare(on) {
             caller_id_number: $("#cid").val() + " (screen)",
 	    outgoingBandwidth: outgoingBandwidth,
 	    incomingBandwidth: incomingBandwidth,
-	    videoParams: screen_constraints.video.mandatory,
+	    videoParams: screen_constraints ? screen_constraints.video.mandatory : {},
             useVideo: true,
 	    screenShare: true,
 	    dedEnc: $("#use_dedenc").is(':checked'),
 	    mirrorInput: $("#mirror_input").is(':checked')
 	});
 
-    });
+    };
 
+    if (!!navigator.mozGetUserMedia) {
+	sharefunc();
+    } else {
+	getScreenId(sharefunc);
+    }
+
+    
 
 
     //$("#main_info").html("Trying");
@@ -963,6 +1010,8 @@ function pop_select(id, cname, dft, onchange) {
 function refresh_devices()
 {
 
+    $.verto.refreshDevices();
+
     $("#useshare").selectmenu({});
     $("#useshare").selectmenu({});
     $("#usemic").selectmenu({});
@@ -1051,6 +1100,13 @@ function refresh_devices()
         pop_select("#usecamera","verto_demo_camera_selected", tmp);
     }
 
+    var tmp;
+    tmp = $.cookie("verto_demo_share_selected") || "false";
+    if (tmp) {
+        $('#useshare option[value=' + tmp + ']').prop('selected', 'selected').change();
+        pop_select("#useshare","verto_demo_share_selected", tmp);
+    }
+
     tmp = $.cookie("verto_demo_mic_selected") || "false";
     if (tmp) {
         $('#usemic option[value=' + tmp + ']').prop('selected', 'selected').change();

libs/esl/.gitignore

@@ -10,3 +10,6 @@ Makefile.in
 !python/Makefile
 !ruby/Makefile
 !tcl/Makefile
+java/classes/org/
+java/esl.jar
+		

libs/esl/fs_cli.c

@@ -76,7 +76,7 @@ static int is_color = 1;
 static int warn_stop = 0;
 static int connected = 0;
 static int allow_ctl_c = 0;
-static char bare_prompt_str[512] = "";
+static char bare_prompt_str[514] = "";
 static int bare_prompt_str_len = 0;
 static char prompt_str[512] = "";
 static char prompt_color[12] = {ESL_SEQ_DEFAULT_COLOR};

libs/esl/java/Makefile

@@ -5,7 +5,7 @@ CLASSES=org/freeswitch/esl/*
 all: esl.jar
 
 esl_wrap.cpp:
-	swig2.0 -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i
+	swig3.0 -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(LOCAL_CFLAGS) $(CXXFLAGS) $(GCC_WARNING_JUNK) $(PERL_INC) -c esl_wrap.cpp -o esl_wrap.o

libs/esl/java/esl_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make

libs/esl/java/org/freeswitch/esl/ESLconnection.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

libs/esl/java/org/freeswitch/esl/ESLevent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_event_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_priority_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

libs/esl/java/org/freeswitch/esl/esl.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

libs/esl/java/org/freeswitch/esl/eslJNI.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

libs/esl/lua/Makefile

@@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
 all: ESL.so
 
 esl_wrap.cpp:
-	swig2.0 -module ESL -lua -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig3.0 -module ESL -lua -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(LUA_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o

libs/esl/managed/ESL.cs

@@ -1,15 +1,12 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-using System;
-using System.Runtime.InteropServices;
-
 public class ESL {
   public static void eslSetLogLevel(int level) {
     ESLPINVOKE.eslSetLogLevel(level);

libs/esl/managed/ESLPINVOKE.cs

@@ -1,15 +1,12 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-using System;
-using System.Runtime.InteropServices;
-
 class ESLPINVOKE {
 
   protected class SWIGExceptionHelper {
@@ -33,7 +30,7 @@ class ESLPINVOKE {
     static ExceptionArgumentDelegate argumentNullDelegate = new ExceptionArgumentDelegate(SetPendingArgumentNullException);
     static ExceptionArgumentDelegate argumentOutOfRangeDelegate = new ExceptionArgumentDelegate(SetPendingArgumentOutOfRangeException);
 
-    [DllImport("ESL", EntryPoint="SWIGRegisterExceptionCallbacks_ESL")]
+    [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="SWIGRegisterExceptionCallbacks_ESL")]
     public static extern void SWIGRegisterExceptionCallbacks_ESL(
                                 ExceptionDelegate applicationDelegate,
                                 ExceptionDelegate arithmeticDelegate,
@@ -47,58 +44,58 @@ class ESLPINVOKE {
                                 ExceptionDelegate overflowDelegate, 
                                 ExceptionDelegate systemExceptionDelegate);
 
-    [DllImport("ESL", EntryPoint="SWIGRegisterExceptionArgumentCallbacks_ESL")]
+    [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="SWIGRegisterExceptionArgumentCallbacks_ESL")]
     public static extern void SWIGRegisterExceptionCallbacksArgument_ESL(
                                 ExceptionArgumentDelegate argumentDelegate,
                                 ExceptionArgumentDelegate argumentNullDelegate,
                                 ExceptionArgumentDelegate argumentOutOfRangeDelegate);
 
     static void SetPendingApplicationException(string message) {
-      SWIGPendingException.Set(new System.ApplicationException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.ApplicationException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingArithmeticException(string message) {
-      SWIGPendingException.Set(new System.ArithmeticException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.ArithmeticException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingDivideByZeroException(string message) {
-      SWIGPendingException.Set(new System.DivideByZeroException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.DivideByZeroException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingIndexOutOfRangeException(string message) {
-      SWIGPendingException.Set(new System.IndexOutOfRangeException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.IndexOutOfRangeException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingInvalidCastException(string message) {
-      SWIGPendingException.Set(new System.InvalidCastException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.InvalidCastException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingInvalidOperationException(string message) {
-      SWIGPendingException.Set(new System.InvalidOperationException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.InvalidOperationException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingIOException(string message) {
-      SWIGPendingException.Set(new System.IO.IOException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.IO.IOException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingNullReferenceException(string message) {
-      SWIGPendingException.Set(new System.NullReferenceException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.NullReferenceException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingOutOfMemoryException(string message) {
-      SWIGPendingException.Set(new System.OutOfMemoryException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.OutOfMemoryException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingOverflowException(string message) {
-      SWIGPendingException.Set(new System.OverflowException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.OverflowException(message, SWIGPendingException.Retrieve()));
     }
     static void SetPendingSystemException(string message) {
-      SWIGPendingException.Set(new System.SystemException(message, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.SystemException(message, SWIGPendingException.Retrieve()));
     }
 
     static void SetPendingArgumentException(string message, string paramName) {
-      SWIGPendingException.Set(new System.ArgumentException(message, paramName, SWIGPendingException.Retrieve()));
+      SWIGPendingException.Set(new global::System.ArgumentException(message, paramName, SWIGPendingException.Retrieve()));
     }
     static void SetPendingArgumentNullException(string message, string paramName) {
-      Exception e = SWIGPendingException.Retrieve();
+      global::System.Exception e = SWIGPendingException.Retrieve();
       if (e != null) message = message + " Inner Exception: " + e.Message;
-      SWIGPendingException.Set(new System.ArgumentNullException(paramName, message));
+      SWIGPendingException.Set(new global::System.ArgumentNullException(paramName, message));
     }
     static void SetPendingArgumentOutOfRangeException(string message, string paramName) {
-      Exception e = SWIGPendingException.Retrieve();
+      global::System.Exception e = SWIGPendingException.Retrieve();
       if (e != null) message = message + " Inner Exception: " + e.Message;
-      SWIGPendingException.Set(new System.ArgumentOutOfRangeException(paramName, message));
+      SWIGPendingException.Set(new global::System.ArgumentOutOfRangeException(paramName, message));
     }
 
     static SWIGExceptionHelper() {
@@ -125,8 +122,8 @@ class ESLPINVOKE {
   protected static SWIGExceptionHelper swigExceptionHelper = new SWIGExceptionHelper();
 
   public class SWIGPendingException {
-    [ThreadStatic]
-    private static Exception pendingException = null;
+    [global::System.ThreadStatic]
+    private static global::System.Exception pendingException = null;
     private static int numExceptionsPending = 0;
 
     public static bool Pending {
@@ -139,17 +136,17 @@ class ESLPINVOKE {
       } 
     }
 
-    public static void Set(Exception e) {
+    public static void Set(global::System.Exception e) {
       if (pendingException != null)
-        throw new ApplicationException("FATAL: An earlier pending exception from unmanaged code was missed and thus not thrown (" + pendingException.ToString() + ")", e);
+        throw new global::System.ApplicationException("FATAL: An earlier pending exception from unmanaged code was missed and thus not thrown (" + pendingException.ToString() + ")", e);
       pendingException = e;
       lock(typeof(ESLPINVOKE)) {
         numExceptionsPending++;
       }
     }
 
-    public static Exception Retrieve() {
-      Exception e = null;
+    public static global::System.Exception Retrieve() {
+      global::System.Exception e = null;
       if (numExceptionsPending > 0) {
         if (pendingException != null) {
           e = pendingException;
@@ -169,7 +166,7 @@ class ESLPINVOKE {
     public delegate string SWIGStringDelegate(string message);
     static SWIGStringDelegate stringDelegate = new SWIGStringDelegate(CreateString);
 
-    [DllImport("ESL", EntryPoint="SWIGRegisterStringCallback_ESL")]
+    [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="SWIGRegisterStringCallback_ESL")]
     public static extern void SWIGRegisterStringCallback_ESL(SWIGStringDelegate stringDelegate);
 
     static string CreateString(string cString) {
@@ -188,144 +185,144 @@ class ESLPINVOKE {
   }
 
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_set")]
-  public static extern void ESLevent_Event_set(HandleRef jarg1, HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_set")]
+  public static extern void ESLevent_Event_set(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_get")]
-  public static extern IntPtr ESLevent_Event_get(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_get")]
+  public static extern global::System.IntPtr ESLevent_Event_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_SerializedString_set")]
-  public static extern void ESLevent_SerializedString_set(HandleRef jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_SerializedString_set")]
+  public static extern void ESLevent_SerializedString_set(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_SerializedString_get")]
-  public static extern string ESLevent_SerializedString_get(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_SerializedString_get")]
+  public static extern string ESLevent_SerializedString_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_Mine_set")]
-  public static extern void ESLevent_Mine_set(HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Mine_set")]
+  public static extern void ESLevent_Mine_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_Mine_get")]
-  public static extern int ESLevent_Mine_get(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Mine_get")]
+  public static extern int ESLevent_Mine_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_0")]
-  public static extern IntPtr new_ESLevent__SWIG_0(string jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_0")]
+  public static extern global::System.IntPtr new_ESLevent__SWIG_0(string jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_1")]
-  public static extern IntPtr new_ESLevent__SWIG_1(HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_1")]
+  public static extern global::System.IntPtr new_ESLevent__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_2")]
-  public static extern IntPtr new_ESLevent__SWIG_2(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLevent__SWIG_2")]
+  public static extern global::System.IntPtr new_ESLevent__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_delete_ESLevent")]
-  public static extern void delete_ESLevent(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_delete_ESLevent")]
+  public static extern void delete_ESLevent(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_Serialize")]
-  public static extern string ESLevent_Serialize(HandleRef jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_Serialize")]
+  public static extern string ESLevent_Serialize(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_SetPriority")]
-  public static extern bool ESLevent_SetPriority(HandleRef jarg1, HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_SetPriority")]
+  public static extern bool ESLevent_SetPriority(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_GetHeader")]
-  public static extern string ESLevent_GetHeader(HandleRef jarg1, string jarg2, int jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_GetHeader")]
+  public static extern string ESLevent_GetHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, int jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_GetBody")]
-  public static extern string ESLevent_GetBody(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_GetBody")]
+  public static extern string ESLevent_GetBody(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_getType")]
-  public static extern string ESLevent_getType(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_getType")]
+  public static extern string ESLevent_getType(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_AddBody")]
-  public static extern bool ESLevent_AddBody(HandleRef jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_AddBody")]
+  public static extern bool ESLevent_AddBody(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_AddHeader")]
-  public static extern bool ESLevent_AddHeader(HandleRef jarg1, string jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_AddHeader")]
+  public static extern bool ESLevent_AddHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_pushHeader")]
-  public static extern bool ESLevent_pushHeader(HandleRef jarg1, string jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_pushHeader")]
+  public static extern bool ESLevent_pushHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_unshiftHeader")]
-  public static extern bool ESLevent_unshiftHeader(HandleRef jarg1, string jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_unshiftHeader")]
+  public static extern bool ESLevent_unshiftHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_DelHeader")]
-  public static extern bool ESLevent_DelHeader(HandleRef jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_DelHeader")]
+  public static extern bool ESLevent_DelHeader(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_FirstHeader")]
-  public static extern string ESLevent_FirstHeader(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_FirstHeader")]
+  public static extern string ESLevent_FirstHeader(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLevent_NextHeader")]
-  public static extern string ESLevent_NextHeader(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLevent_NextHeader")]
+  public static extern string ESLevent_NextHeader(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_0")]
-  public static extern IntPtr new_ESLconnection__SWIG_0(string jarg1, int jarg2, string jarg3, string jarg4);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_0")]
+  public static extern global::System.IntPtr new_ESLconnection__SWIG_0(string jarg1, int jarg2, string jarg3, string jarg4);
 
-  [DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_1")]
-  public static extern IntPtr new_ESLconnection__SWIG_1(string jarg1, int jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_1")]
+  public static extern global::System.IntPtr new_ESLconnection__SWIG_1(string jarg1, int jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_2")]
-  public static extern IntPtr new_ESLconnection__SWIG_2(string jarg1, string jarg2, string jarg3, string jarg4);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_2")]
+  public static extern global::System.IntPtr new_ESLconnection__SWIG_2(string jarg1, string jarg2, string jarg3, string jarg4);
 
-  [DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_3")]
-  public static extern IntPtr new_ESLconnection__SWIG_3(string jarg1, string jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_3")]
+  public static extern global::System.IntPtr new_ESLconnection__SWIG_3(string jarg1, string jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_4")]
-  public static extern IntPtr new_ESLconnection__SWIG_4(int jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_new_ESLconnection__SWIG_4")]
+  public static extern global::System.IntPtr new_ESLconnection__SWIG_4(int jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_delete_ESLconnection")]
-  public static extern void delete_ESLconnection(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_delete_ESLconnection")]
+  public static extern void delete_ESLconnection(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_SocketDescriptor")]
-  public static extern int ESLconnection_SocketDescriptor(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SocketDescriptor")]
+  public static extern int ESLconnection_SocketDescriptor(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_Connected")]
-  public static extern int ESLconnection_Connected(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Connected")]
+  public static extern int ESLconnection_Connected(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_GetInfo")]
-  public static extern IntPtr ESLconnection_GetInfo(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_GetInfo")]
+  public static extern global::System.IntPtr ESLconnection_GetInfo(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_Send")]
-  public static extern int ESLconnection_Send(HandleRef jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Send")]
+  public static extern int ESLconnection_Send(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendRecv")]
-  public static extern IntPtr ESLconnection_SendRecv(HandleRef jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendRecv")]
+  public static extern global::System.IntPtr ESLconnection_SendRecv(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_Api")]
-  public static extern IntPtr ESLconnection_Api(HandleRef jarg1, string jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Api")]
+  public static extern global::System.IntPtr ESLconnection_Api(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_Bgapi")]
-  public static extern IntPtr ESLconnection_Bgapi(HandleRef jarg1, string jarg2, string jarg3, string jarg4);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Bgapi")]
+  public static extern global::System.IntPtr ESLconnection_Bgapi(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3, string jarg4);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendEvent")]
-  public static extern IntPtr ESLconnection_SendEvent(HandleRef jarg1, HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendEvent")]
+  public static extern global::System.IntPtr ESLconnection_SendEvent(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_sendMSG")]
-  public static extern int ESLconnection_sendMSG(HandleRef jarg1, HandleRef jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_sendMSG")]
+  public static extern int ESLconnection_sendMSG(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEvent")]
-  public static extern IntPtr ESLconnection_RecvEvent(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEvent")]
+  public static extern global::System.IntPtr ESLconnection_RecvEvent(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEventTimed")]
-  public static extern IntPtr ESLconnection_RecvEventTimed(HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEventTimed")]
+  public static extern global::System.IntPtr ESLconnection_RecvEventTimed(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_Filter")]
-  public static extern IntPtr ESLconnection_Filter(HandleRef jarg1, string jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Filter")]
+  public static extern global::System.IntPtr ESLconnection_Filter(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_Events")]
-  public static extern int ESLconnection_Events(HandleRef jarg1, string jarg2, string jarg3);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Events")]
+  public static extern int ESLconnection_Events(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_Execute")]
-  public static extern IntPtr ESLconnection_Execute(HandleRef jarg1, string jarg2, string jarg3, string jarg4);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Execute")]
+  public static extern global::System.IntPtr ESLconnection_Execute(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3, string jarg4);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_ExecuteAsync")]
-  public static extern IntPtr ESLconnection_ExecuteAsync(HandleRef jarg1, string jarg2, string jarg3, string jarg4);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_ExecuteAsync")]
+  public static extern global::System.IntPtr ESLconnection_ExecuteAsync(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3, string jarg4);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_SetAsyncExecute")]
-  public static extern int ESLconnection_SetAsyncExecute(HandleRef jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SetAsyncExecute")]
+  public static extern int ESLconnection_SetAsyncExecute(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_SetEventLock")]
-  public static extern int ESLconnection_SetEventLock(HandleRef jarg1, string jarg2);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_SetEventLock")]
+  public static extern int ESLconnection_SetEventLock(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
 
-  [DllImport("ESL", EntryPoint="CSharp_ESLconnection_Disconnect")]
-  public static extern int ESLconnection_Disconnect(HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_ESLconnection_Disconnect")]
+  public static extern int ESLconnection_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [DllImport("ESL", EntryPoint="CSharp_eslSetLogLevel")]
+  [global::System.Runtime.InteropServices.DllImport("ESL", EntryPoint="CSharp_eslSetLogLevel")]
   public static extern void eslSetLogLevel(int jarg1);
 }

libs/esl/managed/ESLconnection.cs

@@ -1,26 +1,23 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-using System;
-using System.Runtime.InteropServices;
-
-public class ESLconnection : IDisposable {
-  private HandleRef swigCPtr;
+public class ESLconnection : global::System.IDisposable {
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
-  internal ESLconnection(IntPtr cPtr, bool cMemoryOwn) {
+  internal ESLconnection(global::System.IntPtr cPtr, bool cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
-    swigCPtr = new HandleRef(this, cPtr);
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
-  internal static HandleRef getCPtr(ESLconnection obj) {
-    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ESLconnection obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
   ~ESLconnection() {
@@ -29,14 +26,14 @@ public class ESLconnection : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
           swigCMemOwn = false;
           ESLPINVOKE.delete_ESLconnection(swigCPtr);
         }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
       }
-      GC.SuppressFinalize(this);
+      global::System.GC.SuppressFinalize(this);
     }
   }
 
@@ -66,8 +63,8 @@ public class ESLconnection : IDisposable {
   }
 
   public ESLevent GetInfo() {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_GetInfo(swigCPtr);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_GetInfo(swigCPtr);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
@@ -77,26 +74,26 @@ public class ESLconnection : IDisposable {
   }
 
   public ESLevent SendRecv(string cmd) {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_SendRecv(swigCPtr, cmd);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_SendRecv(swigCPtr, cmd);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
   public ESLevent Api(string cmd, string arg) {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_Api(swigCPtr, cmd, arg);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_Api(swigCPtr, cmd, arg);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
   public ESLevent Bgapi(string cmd, string arg, string job_uuid) {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_Bgapi(swigCPtr, cmd, arg, job_uuid);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_Bgapi(swigCPtr, cmd, arg, job_uuid);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
   public ESLevent SendEvent(ESLevent send_me) {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_SendEvent(swigCPtr, ESLevent.getCPtr(send_me));
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_SendEvent(swigCPtr, ESLevent.getCPtr(send_me));
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
@@ -106,20 +103,20 @@ public class ESLconnection : IDisposable {
   }
 
   public ESLevent RecvEvent() {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_RecvEvent(swigCPtr);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_RecvEvent(swigCPtr);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
   public ESLevent RecvEventTimed(int ms) {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_RecvEventTimed(swigCPtr, ms);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_RecvEventTimed(swigCPtr, ms);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
   public ESLevent Filter(string header, string value) {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_Filter(swigCPtr, header, value);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_Filter(swigCPtr, header, value);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
@@ -129,14 +126,14 @@ public class ESLconnection : IDisposable {
   }
 
   public ESLevent Execute(string app, string arg, string uuid) {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_Execute(swigCPtr, app, arg, uuid);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_Execute(swigCPtr, app, arg, uuid);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 
   public ESLevent ExecuteAsync(string app, string arg, string uuid) {
-    IntPtr cPtr = ESLPINVOKE.ESLconnection_ExecuteAsync(swigCPtr, app, arg, uuid);
-    ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
+    global::System.IntPtr cPtr = ESLPINVOKE.ESLconnection_ExecuteAsync(swigCPtr, app, arg, uuid);
+    ESLevent ret = (cPtr == global::System.IntPtr.Zero) ? null : new ESLevent(cPtr, true);
     return ret;
   }
 

libs/esl/managed/ESLevent.cs

@@ -1,26 +1,23 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-using System;
-using System.Runtime.InteropServices;
-
-public class ESLevent : IDisposable {
-  private HandleRef swigCPtr;
+public class ESLevent : global::System.IDisposable {
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
-  internal ESLevent(IntPtr cPtr, bool cMemoryOwn) {
+  internal ESLevent(global::System.IntPtr cPtr, bool cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
-    swigCPtr = new HandleRef(this, cPtr);
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
-  internal static HandleRef getCPtr(ESLevent obj) {
-    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ESLevent obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
   ~ESLevent() {
@@ -29,14 +26,14 @@ public class ESLevent : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
+      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
           swigCMemOwn = false;
           ESLPINVOKE.delete_ESLevent(swigCPtr);
         }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
       }
-      GC.SuppressFinalize(this);
+      global::System.GC.SuppressFinalize(this);
     }
   }
 
@@ -45,8 +42,8 @@ public class ESLevent : IDisposable {
       ESLPINVOKE.ESLevent_Event_set(swigCPtr, SWIGTYPE_p_esl_event_t.getCPtr(value));
     } 
     get {
-      IntPtr cPtr = ESLPINVOKE.ESLevent_Event_get(swigCPtr);
-      SWIGTYPE_p_esl_event_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_esl_event_t(cPtr, false);
+      global::System.IntPtr cPtr = ESLPINVOKE.ESLevent_Event_get(swigCPtr);
+      SWIGTYPE_p_esl_event_t ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_esl_event_t(cPtr, false);
       return ret;
     } 
   }

libs/esl/managed/Makefile

@@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
 all: ESL.so
 
 esl_wrap.cpp:
-	swig2.0 -module ESL -csharp -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig3.0 -module ESL -csharp -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o

libs/esl/managed/SWIGTYPE_p_esl_event_t.cs

@@ -1,27 +1,24 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-using System;
-using System.Runtime.InteropServices;
-
 public class SWIGTYPE_p_esl_event_t {
-  private HandleRef swigCPtr;
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal SWIGTYPE_p_esl_event_t(IntPtr cPtr, bool futureUse) {
-    swigCPtr = new HandleRef(this, cPtr);
+  internal SWIGTYPE_p_esl_event_t(global::System.IntPtr cPtr, bool futureUse) {
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
   protected SWIGTYPE_p_esl_event_t() {
-    swigCPtr = new HandleRef(null, IntPtr.Zero);
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
   }
 
-  internal static HandleRef getCPtr(SWIGTYPE_p_esl_event_t obj) {
-    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_esl_event_t obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 }

libs/esl/managed/SWIGTYPE_p_esl_priority_t.cs

@@ -1,27 +1,24 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-using System;
-using System.Runtime.InteropServices;
-
 public class SWIGTYPE_p_esl_priority_t {
-  private HandleRef swigCPtr;
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal SWIGTYPE_p_esl_priority_t(IntPtr cPtr, bool futureUse) {
-    swigCPtr = new HandleRef(this, cPtr);
+  internal SWIGTYPE_p_esl_priority_t(global::System.IntPtr cPtr, bool futureUse) {
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
   protected SWIGTYPE_p_esl_priority_t() {
-    swigCPtr = new HandleRef(null, IntPtr.Zero);
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
   }
 
-  internal static HandleRef getCPtr(SWIGTYPE_p_esl_priority_t obj) {
-    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_esl_priority_t obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 }

libs/esl/managed/esl_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make

libs/esl/perl/ESL.pm

@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.12
+# Version 3.0.2
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.

libs/esl/perl/Makefile.am

@@ -21,7 +21,7 @@ endif
 	$(MAKE) -C ..
 
 esl_wrap.cpp:
-	swig2.0 -module ESL -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig3.0 -module ESL -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 perlxsi.c:
 	$(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c

libs/esl/perl/esl_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -550,14 +550,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   swig_module_info *iter = start;
   do {
     if (iter->size) {
-      register size_t l = 0;
-      register size_t r = iter->size - 1;
+      size_t l = 0;
+      size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1;
+	size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
-	  register int compare = strcmp(name, iname);
+	  int compare = strcmp(name, iname);
 	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
@@ -601,7 +601,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
        of the str field (the human readable name) */
     swig_module_info *iter = start;
     do {
-      register size_t i = 0;
+      size_t i = 0;
       for (; i < iter->size; ++i) {
 	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
 	  return iter->types[i];
@@ -620,10 +620,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
 SWIGRUNTIME char *
 SWIG_PackData(char *c, void *ptr, size_t sz) {
   static const char hex[17] = "0123456789abcdef";
-  register const unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu =  u + sz;
+  const unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
   for (; u != eu; ++u) {
-    register unsigned char uu = *u;
+    unsigned char uu = *u;
     *(c++) = hex[(uu & 0xf0) >> 4];
     *(c++) = hex[uu & 0xf];
   }
@@ -635,11 +635,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
 */
 SWIGRUNTIME const char *
 SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  register unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu = u + sz;
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
-    register char d = *(c++);
-    register unsigned char uu;
+    char d = *(c++);
+    unsigned char uu;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
@@ -894,6 +894,7 @@ SWIG_Perl_ErrorType(int code) {
 #define SWIG_ConvertPtr(obj, pp, type, flags)           SWIG_Perl_ConvertPtr(SWIG_PERL_OBJECT_CALL obj, pp, type, flags)
 #define SWIG_ConvertPtrAndOwn(obj, pp, type, flags,own) SWIG_Perl_ConvertPtrAndOwn(SWIG_PERL_OBJECT_CALL obj, pp, type, flags, own)
 #define SWIG_NewPointerObj(p, type, flags)              SWIG_Perl_NewPointerObj(SWIG_PERL_OBJECT_CALL p, type, flags)
+#define swig_owntype                                    int
 
 /* for raw packed data */
 #define SWIG_ConvertPacked(obj, p, s, type)             SWIG_Perl_ConvertPacked(SWIG_PERL_OBJECT_CALL obj, p, s, type)
@@ -1162,7 +1163,11 @@ SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_
     /* Now see if the types match */
     char *_c = HvNAME(SvSTASH(SvRV(sv)));
     tc = SWIG_TypeProxyCheck(_c,_t);
+#ifdef SWIG_DIRECTORS
+    if (!tc && !sv_derived_from(sv,SWIG_Perl_TypeProxyName(_t))) {
+#else
     if (!tc) {
+#endif
       return SWIG_ERROR;
     }
     {
@@ -1520,7 +1525,7 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #define SWIG_name   "ESLc::boot_ESL"
 #define SWIG_prefix "ESLc::"
 
-#define SWIGVERSION 0x020012 
+#define SWIGVERSION 0x030002 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -4129,7 +4134,7 @@ static swig_command_info swig_commands[] = {
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial
+ * The generated swig_type_info structures are assigned statically to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the

libs/esl/php/ESL.php

@@ -2,7 +2,7 @@
 
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -44,12 +44,6 @@ class ESLevent {
 		$this->_pData[$var] = $value;
 	}
 
-	function __isset($var) {
-		if (function_exists('ESLevent_'.$var.'_set')) return true;
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
 	function __get($var) {
 		$func = 'ESLevent_'.$var.'_get';
 		if (function_exists($func)) return call_user_func($func,$this->_cPtr);
@@ -57,6 +51,12 @@ class ESLevent {
 		return $this->_pData[$var];
 	}
 
+	function __isset($var) {
+		if (function_exists('ESLevent_'.$var.'_get')) return true;
+		if ($var === 'thisown') return true;
+		return array_key_exists($var, $this->_pData);
+	}
+
 	function __construct($type_or_wrap_me_or_me,$subclass_name_or_free_me=null) {
 		if (is_resource($type_or_wrap_me_or_me) && get_resource_type($type_or_wrap_me_or_me) === '_p_ESLevent') {
 			$this->_cPtr=$type_or_wrap_me_or_me;
@@ -134,16 +134,16 @@ class ESLconnection {
 		$this->_pData[$var] = $value;
 	}
 
-	function __isset($var) {
-		if ($var === 'thisown') return true;
-		return array_key_exists($var, $this->_pData);
-	}
-
 	function __get($var) {
 		if ($var === 'thisown') return swig_ESL_get_newobject($this->_cPtr);
 		return $this->_pData[$var];
 	}
 
+	function __isset($var) {
+		if ($var === 'thisown') return true;
+		return array_key_exists($var, $this->_pData);
+	}
+
 	function __construct($host_or_socket,$port=null,$user_or_password=null,$password=null) {
 		if (is_resource($host_or_socket) && get_resource_type($host_or_socket) === '_p_ESLconnection') {
 			$this->_cPtr=$host_or_socket;

libs/esl/php/Makefile.am

@@ -3,7 +3,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function
 all: ESL.so
 
 esl_wrap.cpp:
-	swig2.0 -module ESL -php5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig3.0 -module ESL -php5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 	sed -e 's/  char \*type_name;/  const char \*type_name;/' -i esl_wrap.cpp
 
 esl_wrap.o: esl_wrap.cpp

libs/esl/php/php_ESL.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make

libs/esl/python/ESL.py

@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.12
+# Version 3.0.2
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.

libs/esl/python/Makefile

@@ -5,7 +5,7 @@ SITE_DIR=$(DESTDIR)/`python -c "from distutils.sysconfig import get_python_lib;
 all: _ESL.so
 
 esl_wrap.cpp:
-	swig2.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig3.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o

libs/esl/python/esl_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -562,14 +562,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   swig_module_info *iter = start;
   do {
     if (iter->size) {
-      register size_t l = 0;
-      register size_t r = iter->size - 1;
+      size_t l = 0;
+      size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1;
+	size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
-	  register int compare = strcmp(name, iname);
+	  int compare = strcmp(name, iname);
 	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
@@ -613,7 +613,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
        of the str field (the human readable name) */
     swig_module_info *iter = start;
     do {
-      register size_t i = 0;
+      size_t i = 0;
       for (; i < iter->size; ++i) {
 	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
 	  return iter->types[i];
@@ -632,10 +632,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
 SWIGRUNTIME char *
 SWIG_PackData(char *c, void *ptr, size_t sz) {
   static const char hex[17] = "0123456789abcdef";
-  register const unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu =  u + sz;
+  const unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
   for (; u != eu; ++u) {
-    register unsigned char uu = *u;
+    unsigned char uu = *u;
     *(c++) = hex[(uu & 0xf0) >> 4];
     *(c++) = hex[uu & 0xf];
   }
@@ -647,11 +647,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
 */
 SWIGRUNTIME const char *
 SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  register unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu = u + sz;
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
-    register char d = *(c++);
-    register unsigned char uu;
+    char d = *(c++);
+    unsigned char uu;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
@@ -1328,7 +1328,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
   }  
   if (!PyTuple_Check(args)) {
     if (min <= 1 && max >= 1) {
-      register int i;
+      int i;
       objs[0] = args;
       for (i = 1; i < max; ++i) {
 	objs[i] = 0;
@@ -1338,7 +1338,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register Py_ssize_t l = PyTuple_GET_SIZE(args);
+    Py_ssize_t l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
 		   name, (min == max ? "" : "at least "), (int)min, (int)l);
@@ -1348,7 +1348,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 		   name, (min == max ? "" : "at most "), (int)max, (int)l);
       return 0;
     } else {
-      register int i;
+      int i;
       for (i = 0; i < l; ++i) {
 	objs[i] = PyTuple_GET_ITEM(args, i);
       }
@@ -2463,7 +2463,7 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
     }
   } else {
 #if PY_VERSION_HEX >= 0x03000000
-    inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
+    inst = ((PyTypeObject*) data->newargs)->tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
     if (inst) {
       PyObject_SetAttr(inst, SWIG_This(), swig_this);
       Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
@@ -2966,7 +2966,7 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_ESL"
 
-#define SWIGVERSION 0x020012 
+#define SWIGVERSION 0x030002 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3145,7 +3145,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
 	SWIG_InternalNewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
     } else {
 #if PY_VERSION_HEX >= 0x03000000
+#if PY_VERSION_HEX >= 0x03010000
+      return PyUnicode_DecodeUTF8(carray, static_cast< int >(size), "surrogateescape");
+#else
       return PyUnicode_FromStringAndSize(carray, static_cast< int >(size));
+#endif
 #else
       return PyString_FromStringAndSize(carray, static_cast< int >(size));
 #endif
@@ -5452,7 +5456,7 @@ static swig_const_info swig_const_table[] = {
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial
+ * The generated swig_type_info structures are assigned statically to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -5782,7 +5786,7 @@ extern "C" {
       var = var->next;
     }
     if (res == NULL && !PyErr_Occurred()) {
-      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
+      PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
     }
     return res;
   }
@@ -5799,7 +5803,7 @@ extern "C" {
       var = var->next;
     }
     if (res == 1 && !PyErr_Occurred()) {
-      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
+      PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
     }
     return res;
   }

libs/esl/ruby/Makefile

@@ -6,7 +6,7 @@ RUBY_GEM_DIR=$(shell $(RUBY) -e 'puts RbConfig::CONFIG["rubylibdir"]')
 all: ESL.so
 
 esl_wrap.cpp:
-	swig2.0 -module ESL -ruby -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig3.0 -module ESL -ruby -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o

libs/esl/ruby/esl_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -658,14 +658,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   swig_module_info *iter = start;
   do {
     if (iter->size) {
-      register size_t l = 0;
-      register size_t r = iter->size - 1;
+      size_t l = 0;
+      size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1;
+	size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
-	  register int compare = strcmp(name, iname);
+	  int compare = strcmp(name, iname);
 	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
@@ -709,7 +709,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
        of the str field (the human readable name) */
     swig_module_info *iter = start;
     do {
-      register size_t i = 0;
+      size_t i = 0;
       for (; i < iter->size; ++i) {
 	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
 	  return iter->types[i];
@@ -728,10 +728,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
 SWIGRUNTIME char *
 SWIG_PackData(char *c, void *ptr, size_t sz) {
   static const char hex[17] = "0123456789abcdef";
-  register const unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu =  u + sz;
+  const unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
   for (; u != eu; ++u) {
-    register unsigned char uu = *u;
+    unsigned char uu = *u;
     *(c++) = hex[(uu & 0xf0) >> 4];
     *(c++) = hex[uu & 0xf];
   }
@@ -743,11 +743,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
 */
 SWIGRUNTIME const char *
 SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  register unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu = u + sz;
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
-    register char d = *(c++);
-    register unsigned char uu;
+    char d = *(c++);
+    unsigned char uu;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
@@ -1503,14 +1503,13 @@ SWIG_Ruby_InitRuntime(void)
 SWIGRUNTIME void
 SWIG_Ruby_define_class(swig_type_info *type)
 {
-  VALUE klass;
   char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
   sprintf(klass_name, "TYPE%s", type->name);
   if (NIL_P(_cSWIG_Pointer)) {
     _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
     rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
   }
-  klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
+  rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
   free((void *) klass_name);
 }
 
@@ -1823,7 +1822,7 @@ static VALUE mESL;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020012 
+#define SWIGVERSION 0x030002 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1929,7 +1928,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig3.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -3890,7 +3889,7 @@ static swig_cast_info *swig_cast_initial[] = {
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial
+ * The generated swig_type_info structures are assigned statically to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the

libs/esl/tcl/Makefile

@@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
 all: ESL.so
 
 esl_wrap.cpp:
-	swig -module ESL -tcl -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig3.0 -module ESL -tcl -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o