- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12213 - freeswitch/trunk/src/mod/applications/mod_fax
by FreeSWITCH SVN 21 Feb '09

21 Feb '09

Author: mikej Date: Fri Feb 20 18:21:56 2009 New Revision: 12213 Log: temporary fix to mod_fax by removing pages_transfered which seems to have been moved Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Fri Feb 20 18:21:56 2009 @@ -184,7 +184,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local station id: %s\n", local_ident); +#if 0 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); +#endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Total fax pages: %i\n", t.pages_in_file); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution: %ix%i\n", t.x_resolution, t.y_resolution); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); @@ -212,11 +214,13 @@ switch_channel_set_variable(channel, "fax_local_station_id", local_ident); switch_channel_set_variable(channel, "fax_remote_station_id", far_ident); +#if 0 tmp = switch_mprintf("%i", t.pages_transferred); if (tmp) { switch_channel_set_variable(channel, "fax_document_transferred_pages", tmp); switch_safe_free(tmp); } +#endif tmp = switch_mprintf("%i", t.pages_in_file); if (tmp) {

1 0

[commit] r12212 - in freeswitch/trunk/libs/spandsp/src: . msvc msvc/tiff
by FreeSWITCH SVN 21 Feb '09

21 Feb '09

Author: mikej Date: Fri Feb 20 18:03:22 2009 New Revision: 12212 Log: Add auto-downloading libtiff to spandsp build Added: freeswitch/trunk/libs/spandsp/src/msvc/Download_TIFF.2005.vcproj freeswitch/trunk/libs/spandsp/src/msvc/Download_TIFF.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/tiff/ freeswitch/trunk/libs/spandsp/src/msvc/tiff/cleancount freeswitch/trunk/libs/spandsp/src/msvc/util.vbs Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln freeswitch/trunk/libs/spandsp/src/msvc/ (props changed) Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Fri Feb 20 18:03:22 2009 @@ -44,6 +44,9 @@ msvc/make_modem_filter.2008.vcproj \ msvc/make_at_dictionary.2005.vcproj \ msvc/make_modem_filter.2005.vcproj \ + msvc/Download_TIFF.2008.vcproj \ + msvc/Download_TIFF.2005.vcproj \ + msvc/tiff/cleancout \ msvc/msvcproj.head \ msvc/msvcproj.foot \ msvc/vc8proj.head \ Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln Fri Feb 20 18:03:22 2009 @@ -11,25 +11,45 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.2005.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" + ProjectSection(ProjectDependencies) = postProject + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download TIFF", "msvc\Download_TIFF.2005.vcproj", "{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + All|Win32 = All|Win32 Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.ActiveCfg = All|Win32 + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.Build.0 = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|Win32.ActiveCfg = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.ActiveCfg = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.ActiveCfg = All|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.Build.0 = Release|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|Win32.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|Win32.Build.0 = Release|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.All|Win32.ActiveCfg = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.All|Win32.Build.0 = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.ActiveCfg = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.Build.0 = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.ActiveCfg = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.Build.0 = All|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln Fri Feb 20 18:03:22 2009 @@ -11,25 +11,41 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.2008.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" + ProjectSection(ProjectDependencies) = postProject + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download TIFF", "msvc\Download_TIFF.2008.vcproj", "{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + All|Win32 = All|Win32 + All|x64 = All|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.ActiveCfg = All|Win32 + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|Win32.Build.0 = All|Win32 + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.All|x64.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.Build.0 = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|x64.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|Win32.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|x64.ActiveCfg = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.ActiveCfg = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|Win32.Build.0 = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.All|x64.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|x64.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.ActiveCfg = All|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.ActiveCfg = Release|x64 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x64.ActiveCfg = Release|x64 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x64.Build.0 = Release|x64 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.ActiveCfg = Debug|x64 @@ -38,6 +54,9 @@ {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|x64 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.Build.0 = Release|x64 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|Win32.ActiveCfg = Release|x64 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64.ActiveCfg = Release|x64 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64.Build.0 = Release|x64 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.ActiveCfg = Debug|x64 @@ -46,6 +65,15 @@ {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.ActiveCfg = Release|x64 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.Build.0 = Release|x64 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.All|Win32.ActiveCfg = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.All|Win32.Build.0 = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.All|x64.ActiveCfg = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.ActiveCfg = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.Build.0 = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|x64.ActiveCfg = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.ActiveCfg = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.Build.0 = All|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|x64.ActiveCfg = All|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Added: freeswitch/trunk/libs/spandsp/src/msvc/Download_TIFF.2005.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/Download_TIFF.2005.vcproj Fri Feb 20 18:03:22 2009 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="Download TIFF" + ProjectGUID="{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" + RootNamespace="Download TIFF" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="All|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\tiff\cleancount" + > + <FileConfiguration + Name="All|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading Tiff." + CommandLine="if not exist "$(ProjectDir)..\..\..\tiff-3.8.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/tiff-3.8.2.tar.gz "$(ProjectDir)..\..\.."
" + Outputs="$(ProjectDir)..\..\..\tiff-3.8.2" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/libs/spandsp/src/msvc/Download_TIFF.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/Download_TIFF.2008.vcproj Fri Feb 20 18:03:22 2009 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download TIFF" + ProjectGUID="{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" + RootNamespace="Download TIFF" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="All|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\tiff\cleancount" + > + <FileConfiguration + Name="All|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading Tiff." + CommandLine="if not exist "$(ProjectDir)..\..\..\tiff-3.8.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/tiff-3.8.2.tar.gz "$(ProjectDir)..\..\.."
" + Outputs="$(ProjectDir)..\..\..\tiff-3.8.2" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/libs/spandsp/src/msvc/tiff/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/tiff/cleancount Fri Feb 20 18:03:22 2009 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/spandsp/src/msvc/util.vbs ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/util.vbs Fri Feb 20 18:03:22 2009 @@ -0,0 +1,199 @@ +' +' Contributor(s): +' Michael Jerris <mike(a)jerris.com> +' David A. Horner http://dave.thehorners.com +'---------------------------------------------- + +'On Error Resume Next +' ************** +' Initialization +' ************** + +Set WshShell = CreateObject("WScript.Shell") +Set FSO = CreateObject("Scripting.FileSystemObject") +Set WshSysEnv = WshShell.Environment("SYSTEM") +Set xml = CreateObject("Microsoft.XMLHTTP") +Dim UseWgetEXE + +On Error Resume Next +Set oStream = CreateObject("Adodb.Stream") +On Error Goto 0 + +If Not IsObject(oStream) Then + wscript.echo("Failed to create Adodb.Stream, using alternative download method.") + UseWgetEXE=true +Else + UseWgetEXE=false +End If +Randomize +Set objArgs = WScript.Arguments +quote=Chr(34) +ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName)) +UtilsDir=Showpath(ScriptDir) +ToolsBase="http://svn.freeswitch.org/downloads/win32/" + +If UseWgetEXE Then + GetWgetEXE UtilsDir +End If + +GetCompressionTools UtilsDir + + +If objArgs.Count >=3 Then + Select Case objArgs(0) + Case "Get" + Wget objArgs(1), Showpath(objArgs(2)) + Case "GetUnzip" + WgetUnCompress objArgs(1), Showpath(objArgs(2)) + End Select +End If + + +' ******************* +' Utility Subroutines +' ******************* + + +Sub WgetUnCompress(URL, DestFolder) + If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If + StartPos = InstrRev(URL, "/", -1, 1) + strlength = Len(URL) + filename=Right(URL,strlength-StartPos) + NameEnd = InstrRev(filename, ".",-1, 1) + filestrlength = Len(filename) + filebase = Left(filename,NameEnd) + fileext = Right(filename, Len(filename) - NameEnd) + Wget URL, DestFolder + If fileext = "zip" Then + UnCompress Destfolder & filename, DestFolder & filebase + Else + UnCompress Destfolder & filename, DestFolder + End If +End Sub + +Sub GetCompressionTools(DestFolder) + Dim oExec + If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If + If Not FSO.FileExists(DestFolder & "7za.exe") Then + If Not FSO.FileExists(DestFolder & "7za.tag") Then + Set MyFile = fso.CreateTextFile(DestFolder & "7za.tag", True) + MyFile.WriteLine("This file marks a pending download for 7za.exe so we don't download it twice at the same time") + MyFile.Close + + Wget ToolsBase & "7za.exe", DestFolder + + FSO.DeleteFile DestFolder & "7za.tag" ,true + Else + WScript.Sleep(5000) + End If + End If +End Sub + +Sub GetWgetEXE(DestFolder) + Dim oExec + If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If + If Not FSO.FileExists(DestFolder & "wget.exe") Then + Slow_Wget ToolsBase & "wget.exe", DestFolder + End If +End Sub + +Sub UnCompress(Archive, DestFolder) + batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat" + wscript.echo("Extracting: " & Archive) + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) + MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Archive & quote & " -y -o" & quote & DestFolder & quote ) + MyFile.Close + Set oExec = WshShell.Exec(UtilsDir & batname) + Do + WScript.Echo OExec.StdOut.ReadLine() + Loop While Not OExec.StdOut.atEndOfStream + If FSO.FileExists(Left(Archive, Len(Archive)-3))Then + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) + MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & quote & " -y -o" & quote & DestFolder & quote ) + MyFile.Close + Set oExec = WshShell.Exec(UtilsDir & batname) + Do + WScript.Echo OExec.StdOut.ReadLine() + Loop While Not OExec.StdOut.atEndOfStream + WScript.Sleep(500) + FSO.DeleteFile Left(Archive, Len(Archive)-3) ,true + End If + If FSO.FileExists(Left(Archive, Len(Archive)-3) & "tar")Then + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) + MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & "tar" & quote & " -y -o" & quote & DestFolder & quote ) + MyFile.Close + Set oExec = WshShell.Exec(UtilsDir & batname) + Do + WScript.Echo OExec.StdOut.ReadLine() + Loop While Not OExec.StdOut.atEndOfStream + WScript.Sleep(500) + FSO.DeleteFile Left(Archive, Len(Archive)-3) & "tar",true + End If + + WScript.Sleep(500) + If FSO.FileExists(UtilsDir & batname)Then + FSO.DeleteFile UtilsDir & batname, True + End If +End Sub + +Sub Wget(URL, DestFolder) + StartPos = InstrRev(URL, "/", -1, 1) + strlength = Len(URL) + filename=Right(URL,strlength-StartPos) + If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If + + Wscript.echo("Downloading: " & URL) + +If UseWgetEXE Then + batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat" + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) + MyFile.WriteLine("@cd " & quote & DestFolder & quote) + MyFile.WriteLine("@" & quote & UtilsDir & "wget.exe" & quote & " " & URL) + MyFile.Close + Set oExec = WshShell.Exec(UtilsDir & batname) + Do + WScript.Echo OExec.StdOut.ReadLine() + Loop While Not OExec.StdOut.atEndOfStream + +Else + xml.Open "GET", URL, False + xml.Send + + Const adTypeBinary = 1 + Const adSaveCreateOverWrite = 2 + Const adSaveCreateNotExist = 1 + + oStream.type = adTypeBinary + oStream.open + oStream.write xml.responseBody + oStream.savetofile DestFolder & filename, adSaveCreateOverWrite + oStream.close +End If + +End Sub + +Sub Slow_Wget(URL, DestFolder) + StartPos = InstrRev(URL, "/", -1, 1) + strlength = Len(URL) + filename=Right(URL,strlength-StartPos) + If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If + + Wscript.echo("Downloading: " & URL) + xml.Open "GET", URL, False + xml.Send + + const ForReading = 1 , ForWriting = 2 , ForAppending = 8 + Set MyFile = fso.OpenTextFile(DestFolder & filename ,ForWriting, True) + For i = 1 to lenb(xml.responseBody) + MyFile.write Chr(Ascb(midb(xml.responseBody,i,1))) + Next + MyFile.Close() + +End Sub + +Function Showpath(folderspec) + Set f = FSO.GetFolder(folderspec) + showpath = f.path & "\" +End Function + +

1 0

[commit] r12211 - freeswitch/trunk/libs/spandsp/src/msvc
by FreeSWITCH SVN 21 Feb '09

21 Feb '09

Author: mikej Date: Fri Feb 20 18:01:51 2009 New Revision: 12211 Log: add 2 additional generated headers Modified: freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj Modified: freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj Fri Feb 20 18:01:51 2009 @@ -88,7 +88,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="$(TargetPath) -m V.17 -i -r >$(SolutionDir)\v17rx_fixed_rrc.h
$(TargetPath) -m V.17 -r >$(SolutionDir)\v17rx_floating_rrc.h

$(TargetPath) -m V.17 -i -t >$(SolutionDir)\v17tx_fixed_rrc.h
$(TargetPath) -m V.17 -t >$(SolutionDir)\v17tx_floating_rrc.h

$(TargetPath) -m V.22bis1200 -i -r >$(SolutionDir)\v22bis_rx_1200_fixed_rrc.h
$(TargetPath) -m V.22bis2400 -i -r >$(SolutionDir)\v22bis_rx_2400_fixed_rrc.h
$(TargetPath) -m V.22bis1200 -r >$(SolutionDir)\v22bis_rx_1200_floating_rrc.h
$(TargetPath) -m V.22bis2400 -r >$(SolutionDir)\v22bis_rx_2400_floating_rrc.h

$(TargetPath) -m V.27ter2400 -i -r >$(SolutionDir)\v27ter_rx_2400_fixed_rrc.h
$(TargetPath) -m V.27ter4800 -i -r >$(SolutionDir)\v27ter_rx_4800_fixed_rrc.h
$(TargetPath) -m V.27ter2400 -r >$(SolutionDir)\v27ter_rx_2400_floating_rrc.h
$(TargetPath) -m V.27ter4800 -r >$(SolutionDir)\v27ter_rx_4800_floating_rrc.h
$(TargetPath) -m V.27ter2400 -i -t >$(SolutionDir)\v27ter_tx_2400_fixed_rrc.h
$(TargetPath) -m V.27ter4800 -i -t >$(SolutionDir)\v27ter_tx_4800_fixed_rrc.h
$(TargetPath) -m V.27ter2400 -t >$(SolutionDir)\v27ter_tx_2400_floating_rrc.h
$(TargetPath) -m V.27ter4800 -t >$(SolutionDir)\v27ter_tx_4800_floating_rrc.h

$(TargetPath) -m V.29 -i -r >$(SolutionDir)\v29rx_fixed_rrc.h
$(TargetPath) -m V.29 -r >$(SolutionDir)\v29rx_floating_rrc.h
$(TargetPath) -m V.29 -i -t >$(SolutionDir)\v29tx_fixed_rrc.h
$(TargetPath) -m V.29 -t >$(SolutionDir)\v29tx_floating_rrc.h

" + CommandLine="$(TargetPath) -m V.17 -i -r >$(SolutionDir)\v17rx_fixed_rrc.h
$(TargetPath) -m V.17 -r >$(SolutionDir)\v17rx_floating_rrc.h

$(TargetPath) -m V.17 -i -t >$(SolutionDir)\v17tx_fixed_rrc.h
$(TargetPath) -m V.17 -t >$(SolutionDir)\v17tx_floating_rrc.h

$(TargetPath) -m V.22bis1200 -i -r >$(SolutionDir)\v22bis_rx_1200_fixed_rrc.h
$(TargetPath) -m V.22bis2400 -i -r >$(SolutionDir)\v22bis_rx_2400_fixed_rrc.h
$(TargetPath) -m V.22bis1200 -r >$(SolutionDir)\v22bis_rx_1200_floating_rrc.h
$(TargetPath) -m V.22bis2400 -r >$(SolutionDir)\v22bis_rx_2400_floating_rrc.h
$(TargetPath) -m V.22bis -i -t >$(SolutionDir)\v22bis_tx_fixed_rrc.h
$(TargetPath) -m V.22bis -t >$(SolutionDir)\v22bis_tx_floating_rrc.h

$(TargetPath) -m V.27ter2400 -i -r >$(SolutionDir)\v27ter_rx_2400_fixed_rrc.h
$(TargetPath) -m V.27ter4800 -i -r >$(SolutionDir)\v27ter_rx_4800_fixed_rrc.h
$(TargetPath) -m V.27ter2400 -r >$(SolutionDir)\v27ter_rx_2400_floating_rrc.h
$(TargetPath) -m V.27ter4800 -r >$(SolutionDir)\v27ter_rx_4800_floating_rrc.h
$(TargetPath) -m V.27ter2400 -i -t >$(SolutionDir)\v27ter_tx_2400_fixed_rrc.h
$(TargetPath) -m V.27ter4800 -i -t >$(SolutionDir)\v27ter_tx_4800_fixed_rrc.h
$(TargetPath) -m V.27ter2400 -t >$(SolutionDir)\v27ter_tx_2400_floating_rrc.h
$(TargetPath) -m V.27ter4800 -t >$(SolutionDir)\v27ter_tx_4800_floating_rrc.h

$(TargetPath) -m V.29 -i -r >$(SolutionDir)\v29rx_fixed_rrc.h
$(TargetPath) -m V.29 -r >$(SolutionDir)\v29rx_floating_rrc.h
$(TargetPath) -m V.29 -i -t >$(SolutionDir)\v29tx_fixed_rrc.h
$(TargetPath) -m V.29 -t >$(SolutionDir)\v29tx_floating_rrc.h

" /> </Configuration> </Configurations> Modified: freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj Fri Feb 20 18:01:51 2009 @@ -86,7 +86,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="$(TargetPath) -m V.17 -i -r >$(SolutionDir)\v17rx_fixed_rrc.h
$(TargetPath) -m V.17 -r >$(SolutionDir)\v17rx_floating_rrc.h

$(TargetPath) -m V.17 -i -t >$(SolutionDir)\v17tx_fixed_rrc.h
$(TargetPath) -m V.17 -t >$(SolutionDir)\v17tx_floating_rrc.h

$(TargetPath) -m V.22bis1200 -i -r >$(SolutionDir)\v22bis_rx_1200_fixed_rrc.h
$(TargetPath) -m V.22bis2400 -i -r >$(SolutionDir)\v22bis_rx_2400_fixed_rrc.h
$(TargetPath) -m V.22bis1200 -r >$(SolutionDir)\v22bis_rx_1200_floating_rrc.h
$(TargetPath) -m V.22bis2400 -r >$(SolutionDir)\v22bis_rx_2400_floating_rrc.h

$(TargetPath) -m V.27ter2400 -i -r >$(SolutionDir)\v27ter_rx_2400_fixed_rrc.h
$(TargetPath) -m V.27ter4800 -i -r >$(SolutionDir)\v27ter_rx_4800_fixed_rrc.h
$(TargetPath) -m V.27ter2400 -r >$(SolutionDir)\v27ter_rx_2400_floating_rrc.h
$(TargetPath) -m V.27ter4800 -r >$(SolutionDir)\v27ter_rx_4800_floating_rrc.h
$(TargetPath) -m V.27ter2400 -i -t >$(SolutionDir)\v27ter_tx_2400_fixed_rrc.h
$(TargetPath) -m V.27ter4800 -i -t >$(SolutionDir)\v27ter_tx_4800_fixed_rrc.h
$(TargetPath) -m V.27ter2400 -t >$(SolutionDir)\v27ter_tx_2400_floating_rrc.h
$(TargetPath) -m V.27ter4800 -t >$(SolutionDir)\v27ter_tx_4800_floating_rrc.h

$(TargetPath) -m V.29 -i -r >$(SolutionDir)\v29rx_fixed_rrc.h
$(TargetPath) -m V.29 -r >$(SolutionDir)\v29rx_floating_rrc.h
$(TargetPath) -m V.29 -i -t >$(SolutionDir)\v29tx_fixed_rrc.h
$(TargetPath) -m V.29 -t >$(SolutionDir)\v29tx_floating_rrc.h
" + CommandLine="$(TargetPath) -m V.17 -i -r >$(SolutionDir)\v17rx_fixed_rrc.h
$(TargetPath) -m V.17 -r >$(SolutionDir)\v17rx_floating_rrc.h

$(TargetPath) -m V.17 -i -t >$(SolutionDir)\v17tx_fixed_rrc.h
$(TargetPath) -m V.17 -t >$(SolutionDir)\v17tx_floating_rrc.h

$(TargetPath) -m V.22bis1200 -i -r >$(SolutionDir)\v22bis_rx_1200_fixed_rrc.h
$(TargetPath) -m V.22bis2400 -i -r >$(SolutionDir)\v22bis_rx_2400_fixed_rrc.h
$(TargetPath) -m V.22bis1200 -r >$(SolutionDir)\v22bis_rx_1200_floating_rrc.h
$(TargetPath) -m V.22bis2400 -r >$(SolutionDir)\v22bis_rx_2400_floating_rrc.h
$(TargetPath) -m V.22bis -i -t >$(SolutionDir)\v22bis_tx_fixed_rrc.h
$(TargetPath) -m V.22bis -t >$(SolutionDir)\v22bis_tx_floating_rrc.h

$(TargetPath) -m V.27ter2400 -i -r >$(SolutionDir)\v27ter_rx_2400_fixed_rrc.h
$(TargetPath) -m V.27ter4800 -i -r >$(SolutionDir)\v27ter_rx_4800_fixed_rrc.h
$(TargetPath) -m V.27ter2400 -r >$(SolutionDir)\v27ter_rx_2400_floating_rrc.h
$(TargetPath) -m V.27ter4800 -r >$(SolutionDir)\v27ter_rx_4800_floating_rrc.h
$(TargetPath) -m V.27ter2400 -i -t >$(SolutionDir)\v27ter_tx_2400_fixed_rrc.h
$(TargetPath) -m V.27ter4800 -i -t >$(SolutionDir)\v27ter_tx_4800_fixed_rrc.h
$(TargetPath) -m V.27ter2400 -t >$(SolutionDir)\v27ter_tx_2400_floating_rrc.h
$(TargetPath) -m V.27ter4800 -t >$(SolutionDir)\v27ter_tx_4800_floating_rrc.h

$(TargetPath) -m V.29 -i -r >$(SolutionDir)\v29rx_fixed_rrc.h
$(TargetPath) -m V.29 -r >$(SolutionDir)\v29rx_floating_rrc.h
$(TargetPath) -m V.29 -i -t >$(SolutionDir)\v29tx_fixed_rrc.h
$(TargetPath) -m V.29 -t >$(SolutionDir)\v29tx_floating_rrc.h
" /> </Configuration> </Configurations>

1 0

[commit] r12210 - freeswitch/trunk/libs/esl/python
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: brian Date: Fri Feb 20 17:12:47 2009 New Revision: 12210 Log: get out of a pickle Modified: freeswitch/trunk/libs/esl/python/server.py Modified: freeswitch/trunk/libs/esl/python/server.py ============================================================================== --- freeswitch/trunk/libs/esl/python/server.py (original) +++ freeswitch/trunk/libs/esl/python/server.py Fri Feb 20 17:12:47 2009 @@ -1,7 +1,6 @@ #!/usr/bin/env python import SocketServer -import pickle from ESL import * class ESLRequestHandler(SocketServer.BaseRequestHandler ):

1 0

[commit] r12209 - in freeswitch/trunk/libs/esl: lua perl php python ruby src src/include
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: anthm Date: Fri Feb 20 17:03:06 2009 New Revision: 12209 Log: trick swig Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp freeswitch/trunk/libs/esl/perl/esl_wrap.cpp freeswitch/trunk/libs/esl/php/esl_wrap.cpp freeswitch/trunk/libs/esl/python/esl_wrap.cpp freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp freeswitch/trunk/libs/esl/src/esl_oop.cpp freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp Fri Feb 20 17:03:06 2009 @@ -1488,9 +1488,8 @@ #define SWIGTYPE_p_ESLevent swig_types[1] #define SWIGTYPE_p_esl_event_t swig_types[2] #define SWIGTYPE_p_esl_priority_t swig_types[3] -#define SWIGTYPE_p_esl_status_t swig_types[4] -static swig_type_info *swig_types[6]; -static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0}; +static swig_type_info *swig_types[5]; +static swig_module_info swig_module = {swig_types, 4, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2278,7 +2277,7 @@ int SWIG_arg = -1; ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; - esl_status_t result; + int result; SWIG_check_num_args("send",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("send",1,"ESLconnection *"); @@ -2289,12 +2288,9 @@ } arg2 = (char *)lua_tostring(L, 2); - result = (arg1)->send((char const *)arg2); + result = (int)(arg1)->send((char const *)arg2); SWIG_arg=0; - { - esl_status_t * resultptr = new esl_status_t((esl_status_t &) result); - SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++; - } + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; @@ -2403,7 +2399,7 @@ int SWIG_arg = -1; ESLconnection *arg1 = (ESLconnection *) 0 ; ESLevent *arg2 = (ESLevent *) 0 ; - esl_status_t result; + int result; SWIG_check_num_args("sendEvent",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("sendEvent",1,"ESLconnection *"); @@ -2418,12 +2414,9 @@ SWIG_fail_ptr("ESLconnection_sendEvent",2,SWIGTYPE_p_ESLevent); } - result = (arg1)->sendEvent(arg2); + result = (int)(arg1)->sendEvent(arg2); SWIG_arg=0; - { - esl_status_t * resultptr = new esl_status_t((esl_status_t &) result); - SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++; - } + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; @@ -2492,7 +2485,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; SWIG_check_num_args("filter",3,3) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("filter",1,"ESLconnection *"); @@ -2505,12 +2498,9 @@ arg2 = (char *)lua_tostring(L, 2); arg3 = (char *)lua_tostring(L, 3); - result = (arg1)->filter((char const *)arg2,(char const *)arg3); + result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); SWIG_arg=0; - { - esl_status_t * resultptr = new esl_status_t((esl_status_t &) result); - SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++; - } + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; @@ -2526,7 +2516,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; SWIG_check_num_args("events",3,3) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("events",1,"ESLconnection *"); @@ -2539,12 +2529,9 @@ arg2 = (char *)lua_tostring(L, 2); arg3 = (char *)lua_tostring(L, 3); - result = (arg1)->events((char const *)arg2,(char const *)arg3); + result = (int)(arg1)->events((char const *)arg2,(char const *)arg3); SWIG_arg=0; - { - esl_status_t * resultptr = new esl_status_t((esl_status_t &) result); - SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++; - } + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; @@ -2561,7 +2548,7 @@ char *arg2 = (char *) 0 ; char *arg3 = (char *) NULL ; char *arg4 = (char *) NULL ; - esl_status_t result; + int result; SWIG_check_num_args("execute",2,4) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("execute",1,"ESLconnection *"); @@ -2580,12 +2567,9 @@ if(lua_gettop(L)>=4){ arg4 = (char *)lua_tostring(L, 4); } - result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); + result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); SWIG_arg=0; - { - esl_status_t * resultptr = new esl_status_t((esl_status_t &) result); - SWIG_NewPointerObj(L,(void *) resultptr,SWIGTYPE_p_esl_status_t,1); SWIG_arg++; - } + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; @@ -2723,28 +2707,24 @@ static swig_type_info _swigt__p_ESLevent = {"_p_ESLevent", "ESLevent *", 0, 0, (void*)&_wrap_class_ESLevent, 0}; static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0}; static swig_type_info *swig_type_initial[] = { &_swigt__p_ESLconnection, &_swigt__p_ESLevent, &_swigt__p_esl_event_t, &_swigt__p_esl_priority_t, - &_swigt__p_esl_status_t, }; static swig_cast_info _swigc__p_ESLconnection[] = { {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_ESLevent[] = { {&_swigt__p_ESLevent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_event_t[] = { {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_priority_t[] = { {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_esl_status_t[] = { {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_ESLconnection, _swigc__p_ESLevent, _swigc__p_esl_event_t, _swigc__p_esl_priority_t, - _swigc__p_esl_status_t, }; Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp Fri Feb 20 17:03:06 2009 @@ -1451,9 +1451,8 @@ #define SWIGTYPE_p_char swig_types[2] #define SWIGTYPE_p_esl_event_t swig_types[3] #define SWIGTYPE_p_esl_priority_t swig_types[4] -#define SWIGTYPE_p_esl_status_t swig_types[5] -static swig_type_info *swig_types[7]; -static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0}; +static swig_type_info *swig_types[6]; +static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2750,7 +2749,7 @@ { ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -2772,8 +2771,8 @@ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_send" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); - result = (arg1)->send((char const *)arg2); - ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ; + result = (int)(arg1)->send((char const *)arg2); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; XSRETURN(argvi); @@ -2932,7 +2931,7 @@ { ESLconnection *arg1 = (ESLconnection *) 0 ; ESLevent *arg2 = (ESLevent *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -2953,8 +2952,8 @@ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_sendEvent" "', argument " "2"" of type '" "ESLevent *""'"); } arg2 = reinterpret_cast< ESLevent * >(argp2); - result = (arg1)->sendEvent(arg2); - ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ; + result = (int)(arg1)->sendEvent(arg2); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; XSRETURN(argvi); @@ -3037,7 +3036,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3067,8 +3066,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - result = (arg1)->filter((char const *)arg2,(char const *)arg3); - ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ; + result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; @@ -3087,7 +3086,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3117,8 +3116,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_events" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - result = (arg1)->events((char const *)arg2,(char const *)arg3); - ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ; + result = (int)(arg1)->events((char const *)arg2,(char const *)arg3); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; @@ -3138,7 +3137,7 @@ char *arg2 = (char *) 0 ; char *arg3 = (char *) NULL ; char *arg4 = (char *) NULL ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3180,8 +3179,8 @@ } arg4 = reinterpret_cast< char * >(buf4); } - result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); - ST(argvi) = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0); argvi++ ; + result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; @@ -3310,7 +3309,6 @@ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0}; static swig_type_info *swig_type_initial[] = { &_swigt__p_ESLconnection, @@ -3318,7 +3316,6 @@ &_swigt__p_char, &_swigt__p_esl_event_t, &_swigt__p_esl_priority_t, - &_swigt__p_esl_status_t, }; static swig_cast_info _swigc__p_ESLconnection[] = { {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}}; @@ -3326,7 +3323,6 @@ static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_event_t[] = { {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_priority_t[] = { {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_esl_status_t[] = { {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_ESLconnection, @@ -3334,7 +3330,6 @@ _swigc__p_char, _swigc__p_esl_event_t, _swigc__p_esl_priority_t, - _swigc__p_esl_status_t, }; Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/php/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp Fri Feb 20 17:03:06 2009 @@ -932,9 +932,8 @@ #define SWIGTYPE_p_ESLevent swig_types[1] #define SWIGTYPE_p_esl_event_t swig_types[2] #define SWIGTYPE_p_esl_priority_t swig_types[3] -#define SWIGTYPE_p_esl_status_t swig_types[4] -static swig_type_info *swig_types[6]; -static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0}; +static swig_type_info *swig_types[5]; +static swig_module_info swig_module = {swig_types, 4, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -988,28 +987,24 @@ static swig_type_info _swigt__p_ESLevent = {"_p_ESLevent", "ESLevent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0}; static swig_type_info *swig_type_initial[] = { &_swigt__p_ESLconnection, &_swigt__p_ESLevent, &_swigt__p_esl_event_t, &_swigt__p_esl_priority_t, - &_swigt__p_esl_status_t, }; static swig_cast_info _swigc__p_ESLconnection[] = { {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_ESLevent[] = { {&_swigt__p_ESLevent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_event_t[] = { {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_priority_t[] = { {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_esl_status_t[] = { {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_ESLconnection, _swigc__p_ESLevent, _swigc__p_esl_event_t, _swigc__p_esl_priority_t, - _swigc__p_esl_status_t, }; @@ -1018,7 +1013,6 @@ /* end header section */ /* vdecl subsection */ static int le_swig__p_esl_priority_t=0; /* handle for _p_esl_priority_t */ -static int le_swig__p_esl_status_t=0; /* handle for _p_esl_status_t */ static int le_swig__p_ESLevent=0; /* handle for ESLevent */ static int le_swig__p_esl_event_t=0; /* handle for _p_esl_event_t */ static int le_swig__p_ESLconnection=0; /* handle for ESLconnection */ @@ -1822,7 +1816,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_send) { ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; - esl_status_t result; + int result; zval **args[2]; SWIG_ResetError(); @@ -1842,10 +1836,9 @@ arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; - result = (arg1)->send((char const *)arg2); + result = (int)(arg1)->send((char const *)arg2); { - esl_status_t * resultobj = new esl_status_t((esl_status_t &) result); - SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1); + ZVAL_LONG(return_value,result); } return; fail: @@ -1975,7 +1968,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_sendEvent) { ESLconnection *arg1 = (ESLconnection *) 0 ; ESLevent *arg2 = (ESLevent *) 0 ; - esl_status_t result; + int result; zval **args[2]; SWIG_ResetError(); @@ -1994,10 +1987,9 @@ SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of ESLconnection_sendEvent. Expected SWIGTYPE_p_ESLevent"); } } - result = (arg1)->sendEvent(arg2); + result = (int)(arg1)->sendEvent(arg2); { - esl_status_t * resultobj = new esl_status_t((esl_status_t &) result); - SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1); + ZVAL_LONG(return_value,result); } return; fail: @@ -2068,7 +2060,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; zval **args[3]; SWIG_ResetError(); @@ -2094,10 +2086,9 @@ arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; - result = (arg1)->filter((char const *)arg2,(char const *)arg3); + result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); { - esl_status_t * resultobj = new esl_status_t((esl_status_t &) result); - SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1); + ZVAL_LONG(return_value,result); } return; fail: @@ -2109,7 +2100,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; zval **args[3]; SWIG_ResetError(); @@ -2135,10 +2126,9 @@ arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; - result = (arg1)->events((char const *)arg2,(char const *)arg3); + result = (int)(arg1)->events((char const *)arg2,(char const *)arg3); { - esl_status_t * resultobj = new esl_status_t((esl_status_t &) result); - SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1); + ZVAL_LONG(return_value,result); } return; fail: @@ -2151,7 +2141,7 @@ char *arg2 = (char *) 0 ; char *arg3 = (char *) NULL ; char *arg4 = (char *) NULL ; - esl_status_t result; + int result; zval **args[4]; int arg_count; @@ -2187,10 +2177,9 @@ /*@SWIG@*/; } - result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); + result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); { - esl_status_t * resultobj = new esl_status_t((esl_status_t &) result); - SWIG_SetPointerZval(return_value, (void *)resultobj, SWIGTYPE_p_esl_status_t, 1); + ZVAL_LONG(return_value,result); } return; fail: @@ -2292,10 +2281,6 @@ /* No destructor for simple type _p_esl_priority_t */ } /* NEW Destructor style */ -static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_esl_status_t) { - /* No destructor for simple type _p_esl_status_t */ -} -/* NEW Destructor style */ static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_ESLevent) { __wrap_delete_ESLevent(rsrc, SWIGTYPE_p_ESLevent->name TSRMLS_CC); } @@ -2623,8 +2608,6 @@ /* Register resource destructors for pointer types */ le_swig__p_esl_priority_t=zend_register_list_destructors_ex(_wrap_destroy_p_esl_priority_t,NULL,(char *)(SWIGTYPE_p_esl_priority_t->name),module_number); SWIG_TypeClientData(SWIGTYPE_p_esl_priority_t,&le_swig__p_esl_priority_t); -le_swig__p_esl_status_t=zend_register_list_destructors_ex(_wrap_destroy_p_esl_status_t,NULL,(char *)(SWIGTYPE_p_esl_status_t->name),module_number); -SWIG_TypeClientData(SWIGTYPE_p_esl_status_t,&le_swig__p_esl_status_t); le_swig__p_ESLevent=zend_register_list_destructors_ex(_wrap_destroy_p_ESLevent,NULL,(char *)(SWIGTYPE_p_ESLevent->name),module_number); SWIG_TypeClientData(SWIGTYPE_p_ESLevent,&le_swig__p_ESLevent); le_swig__p_esl_event_t=zend_register_list_destructors_ex(_wrap_destroy_p_esl_event_t,NULL,(char *)(SWIGTYPE_p_esl_event_t->name),module_number); Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/python/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp Fri Feb 20 17:03:06 2009 @@ -2501,9 +2501,8 @@ #define SWIGTYPE_p_char swig_types[2] #define SWIGTYPE_p_esl_event_t swig_types[3] #define SWIGTYPE_p_esl_priority_t swig_types[4] -#define SWIGTYPE_p_esl_status_t swig_types[5] -static swig_type_info *swig_types[7]; -static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0}; +static swig_type_info *swig_types[6]; +static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3664,7 +3663,7 @@ PyObject *resultobj = 0; ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3684,8 +3683,8 @@ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_send" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); - result = (arg1)->send((char const *)arg2); - resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->send((char const *)arg2); + resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return resultobj; fail: @@ -3828,7 +3827,7 @@ PyObject *resultobj = 0; ESLconnection *arg1 = (ESLconnection *) 0 ; ESLevent *arg2 = (ESLevent *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -3847,8 +3846,8 @@ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_sendEvent" "', argument " "2"" of type '" "ESLevent *""'"); } arg2 = reinterpret_cast< ESLevent * >(argp2); - result = (arg1)->sendEvent(arg2); - resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->sendEvent(arg2); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -3913,7 +3912,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3942,8 +3941,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - result = (arg1)->filter((char const *)arg2,(char const *)arg3); - resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); + resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return resultobj; @@ -3959,7 +3958,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3988,8 +3987,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_events" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - result = (arg1)->events((char const *)arg2,(char const *)arg3); - resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->events((char const *)arg2,(char const *)arg3); + resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return resultobj; @@ -4006,7 +4005,7 @@ char *arg2 = (char *) 0 ; char *arg3 = (char *) NULL ; char *arg4 = (char *) NULL ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -4048,8 +4047,8 @@ } arg4 = reinterpret_cast< char * >(buf4); } - result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); - resultobj = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); + resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; if (alloc4 == SWIG_NEWOBJ) delete[] buf4; @@ -4205,7 +4204,6 @@ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0}; static swig_type_info *swig_type_initial[] = { &_swigt__p_ESLconnection, @@ -4213,7 +4211,6 @@ &_swigt__p_char, &_swigt__p_esl_event_t, &_swigt__p_esl_priority_t, - &_swigt__p_esl_status_t, }; static swig_cast_info _swigc__p_ESLconnection[] = { {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}}; @@ -4221,7 +4218,6 @@ static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_event_t[] = { {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_priority_t[] = { {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_esl_status_t[] = { {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_ESLconnection, @@ -4229,7 +4225,6 @@ _swigc__p_char, _swigc__p_esl_event_t, _swigc__p_esl_priority_t, - _swigc__p_esl_status_t, }; Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp Fri Feb 20 17:03:06 2009 @@ -1776,9 +1776,8 @@ #define SWIGTYPE_p_char swig_types[2] #define SWIGTYPE_p_esl_event_t swig_types[3] #define SWIGTYPE_p_esl_priority_t swig_types[4] -#define SWIGTYPE_p_esl_status_t swig_types[5] -static swig_type_info *swig_types[7]; -static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0}; +static swig_type_info *swig_types[6]; +static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2785,7 +2784,7 @@ _wrap_ESLconnection_send(int argc, VALUE *argv, VALUE self) { ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -2806,8 +2805,8 @@ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","send", 2, argv[0] )); } arg2 = reinterpret_cast< char * >(buf2); - result = (arg1)->send((char const *)arg2); - vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->send((char const *)arg2); + vresult = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return vresult; fail: @@ -2951,7 +2950,7 @@ _wrap_ESLconnection_sendEvent(int argc, VALUE *argv, VALUE self) { ESLconnection *arg1 = (ESLconnection *) 0 ; ESLevent *arg2 = (ESLevent *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -2971,8 +2970,8 @@ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "ESLevent *","sendEvent", 2, argv[0] )); } arg2 = reinterpret_cast< ESLevent * >(argp2); - result = (arg1)->sendEvent(arg2); - vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->sendEvent(arg2); + vresult = SWIG_From_int(static_cast< int >(result)); return vresult; fail: return Qnil; @@ -3040,7 +3039,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3069,8 +3068,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","filter", 3, argv[1] )); } arg3 = reinterpret_cast< char * >(buf3); - result = (arg1)->filter((char const *)arg2,(char const *)arg3); - vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); + vresult = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return vresult; @@ -3086,7 +3085,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3115,8 +3114,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","events", 3, argv[1] )); } arg3 = reinterpret_cast< char * >(buf3); - result = (arg1)->events((char const *)arg2,(char const *)arg3); - vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->events((char const *)arg2,(char const *)arg3); + vresult = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return vresult; @@ -3133,7 +3132,7 @@ char *arg2 = (char *) 0 ; char *arg3 = (char *) NULL ; char *arg4 = (char *) NULL ; - esl_status_t result; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3174,8 +3173,8 @@ } arg4 = reinterpret_cast< char * >(buf4); } - result = (arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); - vresult = SWIG_NewPointerObj((new esl_status_t(static_cast< const esl_status_t& >(result))), SWIGTYPE_p_esl_status_t, SWIG_POINTER_OWN | 0 ); + result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); + vresult = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; if (alloc4 == SWIG_NEWOBJ) delete[] buf4; @@ -3287,7 +3286,6 @@ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_event_t = {"_p_esl_event_t", "esl_event_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_esl_priority_t = {"_p_esl_priority_t", "esl_priority_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_esl_status_t = {"_p_esl_status_t", "esl_status_t *", 0, 0, (void*)0, 0}; static swig_type_info *swig_type_initial[] = { &_swigt__p_ESLconnection, @@ -3295,7 +3293,6 @@ &_swigt__p_char, &_swigt__p_esl_event_t, &_swigt__p_esl_priority_t, - &_swigt__p_esl_status_t, }; static swig_cast_info _swigc__p_ESLconnection[] = { {&_swigt__p_ESLconnection, 0, 0, 0},{0, 0, 0, 0}}; @@ -3303,7 +3300,6 @@ static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_event_t[] = { {&_swigt__p_esl_event_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_esl_priority_t[] = { {&_swigt__p_esl_priority_t, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_esl_status_t[] = { {&_swigt__p_esl_status_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_ESLconnection, @@ -3311,7 +3307,6 @@ _swigc__p_char, _swigc__p_esl_event_t, _swigc__p_esl_priority_t, - _swigc__p_esl_status_t, }; Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Fri Feb 20 17:03:06 2009 @@ -38,7 +38,7 @@ return handle.connected; } -esl_status_t ESLconnection::send(const char *cmd) +int ESLconnection::send(const char *cmd) { return esl_send(&handle, cmd); } @@ -137,12 +137,12 @@ return handle.event_lock; } -esl_status_t ESLconnection::execute(const char *app, const char *arg, const char *uuid) +int ESLconnection::execute(const char *app, const char *arg, const char *uuid) { return esl_execute(&handle, app, arg, uuid); } -esl_status_t ESLconnection::sendEvent(ESLevent *send_me) +int ESLconnection::sendEvent(ESLevent *send_me) { return esl_sendevent(&handle, send_me->event); } @@ -186,12 +186,12 @@ return NULL; } -esl_status_t ESLconnection::filter(const char *header, const char *value) +int ESLconnection::filter(const char *header, const char *value) { return esl_filter(&handle, header, value); } -esl_status_t ESLconnection::events(const char *etype, const char *value) +int ESLconnection::events(const char *etype, const char *value) { esl_event_type_t type_id = ESL_EVENT_TYPE_PLAIN; Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Fri Feb 20 17:03:06 2009 @@ -75,16 +75,16 @@ virtual ~ESLconnection(); int connected(); ESLevent *getInfo(); - esl_status_t send(const char *cmd); + int send(const char *cmd); ESLevent *sendRecv(const char *cmd); ESLevent *api(const char *cmd, const char *arg = NULL); ESLevent *bgapi(const char *cmd, const char *arg = NULL); - esl_status_t sendEvent(ESLevent *send_me); + int sendEvent(ESLevent *send_me); ESLevent *recvEvent(); ESLevent *recvEventTimed(int ms); - esl_status_t filter(const char *header, const char *value); - esl_status_t events(const char *etype, const char *value); - esl_status_t execute(const char *app, const char *arg = NULL, const char *uuid = NULL); + int filter(const char *header, const char *value); + int events(const char *etype, const char *value); + int execute(const char *app, const char *arg = NULL, const char *uuid = NULL); int setBlockingExecute(const char *val); int setEventLock(const char *val); };

1 0

[commit] r12208 - in freeswitch/trunk/libs/spandsp/src: . msvc
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: mikej Date: Fri Feb 20 16:44:26 2009 New Revision: 12208 Log: remove file no longer needed Removed: freeswitch/trunk/libs/spandsp/src/msvc/make_headers.bat Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Fri Feb 20 16:44:26 2009 @@ -40,7 +40,6 @@ msvc/unistd.h \ msvc/spandsp.h \ msvc/sys/time.h \ - msvc/make_headers.bat \ msvc/make_at_dictionary.2008.vcproj \ msvc/make_modem_filter.2008.vcproj \ msvc/make_at_dictionary.2005.vcproj \

1 0

[commit] r12207 - in freeswitch/trunk/libs/spandsp/src: . msvc spandsp
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: mikej Date: Fri Feb 20 16:37:18 2009 New Revision: 12207 Log: merge in x64 build for msvc9 Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln Fri Feb 20 16:37:18 2009 @@ -15,23 +15,37 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|Win32.Build.0 = All|Win32 + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Debug|x64.ActiveCfg = All|Win32 {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|Win32.ActiveCfg = All|Win32 + {DEE932AB-5911-4700-9EEB-8C7090A0A330}.Release|x64.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|Win32.Build.0 = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Debug|x64.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.ActiveCfg = All|Win32 + {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.ActiveCfg = All|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.ActiveCfg = Debug|x64 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.Build.0 = Debug|x64 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|x64 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.Build.0 = Release|x64 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.ActiveCfg = Debug|x64 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.Build.0 = Debug|x64 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.ActiveCfg = Release|x64 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj Fri Feb 20 16:37:18 2009 @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -79,6 +82,69 @@ TargetMachine="1" /> </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + CompileAs="1" + DisableSpecificWarnings="4127" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(TargetDir)spandsp.lib" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + DisableSpecificWarnings="4127" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(TargetDir)spandsp.lib" + TargetMachine="17" + /> + </Configuration> </Configurations> <References> </References> @@ -292,14 +358,4 @@ <File RelativePath="spandsp/private/v8.h"></File> <File RelativePath="spandsp/expose.h"></File> <File RelativePath="spandsp.h"></File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> + </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > </Filter> </Files> <Globals> </Globals></VisualStudioProject> \ No newline at end of file Modified: freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj Fri Feb 20 16:37:18 2009 @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -25,7 +28,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y
" /> <Tool Name="VCCustomBuildTool" @@ -90,7 +93,133 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="0" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="0" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y
" /> <Tool Name="VCCustomBuildTool" @@ -103,6 +232,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head Fri Feb 20 16:37:18 2009 @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -79,6 +82,69 @@ TargetMachine="1" /> </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + CompileAs="1" + DisableSpecificWarnings="4127" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(TargetDir)spandsp.lib" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + DisableSpecificWarnings="4127" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(TargetDir)spandsp.lib" + TargetMachine="17" + /> + </Configuration> </Configurations> <References> </References> Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h Fri Feb 20 16:37:18 2009 @@ -231,7 +231,7 @@ } #endif -#elif defined(WIN32) || defined(_WIN32) +#elif (defined(WIN32) || defined(_WIN32)) && !defined(_WIN64) /* * Win32 doesn't seem to have the lrint() and lrintf() functions. * Therefore implement inline versions of these functions here. @@ -308,6 +308,14 @@ { return (long int) (x); } + __inline__ long int lrint(double x) + { + return (long int) (x); + } + __inline__ long int lrintf(float x) + { + return (long int) (x); + } __inline long int lfastrintf(float x) {

1 0

[commit] r12206 - freeswitch/trunk/libs/esl/python
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: brian Date: Fri Feb 20 16:36:10 2009 New Revision: 12206 Log: oops remove the perl example inside here Modified: freeswitch/trunk/libs/esl/python/server.py Modified: freeswitch/trunk/libs/esl/python/server.py ============================================================================== --- freeswitch/trunk/libs/esl/python/server.py (original) +++ freeswitch/trunk/libs/esl/python/server.py Fri Feb 20 16:36:10 2009 @@ -4,8 +4,6 @@ import pickle from ESL import * -#eslSetLogLevel(7) - class ESLRequestHandler(SocketServer.BaseRequestHandler ): def setup(self): print self.client_address, 'connected!' @@ -30,37 +28,3 @@ server.serve_forever() - - -#require ESL; -#use IO::Socket::INET; -# -#my $ip = "127.0.0.1"; -#my $sock = new IO::Socket::INET ( LocalHost => $ip, LocalPort => '8040', Proto => 'tcp', Listen => 1, Reuse => 1 ); -#die "Could not create socket: $!\n" unless $sock; -# -#for(;;) { -# my $new_sock = $sock->accept(); -# my $pid = fork(); -# if ($pid) { -# close($new_sock); -# next; -# } -# -# my $host = $new_sock->sockhost(); -# my $fd = fileno($new_sock); -# -# my $con = new ESL::ESLconnection($fd); -# my $info = $con->getInfo(); -# -# print $info->serialize(); -# -# my $uuid = $info->getHeader("unique-id"); -# -# $con->execute("answer", "", $uuid); -# $con->execute("playback", "/ram/swimp.raw", $uuid); -# -# close($new_sock); -#} - -

1 0

[commit] r12205 - freeswitch/trunk/libs/esl/python
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: brian Date: Fri Feb 20 16:35:05 2009 New Revision: 12205 Log: add server example for python thanks anm Added: freeswitch/trunk/libs/esl/python/server.py Added: freeswitch/trunk/libs/esl/python/server.py ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/python/server.py Fri Feb 20 16:35:05 2009 @@ -0,0 +1,66 @@ +#!/usr/bin/env python + +import SocketServer +import pickle +from ESL import * + +#eslSetLogLevel(7) + +class ESLRequestHandler(SocketServer.BaseRequestHandler ): + def setup(self): + print self.client_address, 'connected!' + + fd = self.request.fileno() + print fd + + con = ESLconnection(fd) + print "Connected: " + print con.connected() + if con.connected(): + + info = con.getInfo() + + uuid = info.getHeader("unique-id") + print uuid + con.execute("answer", "", uuid) + con.execute("playback", "/ram/swimp.raw", uuid); + +#server host is a tuple ('host', port) +server = SocketServer.ThreadingTCPServer(('', 8040), ESLRequestHandler) +server.serve_forever() + + + + +#require ESL; +#use IO::Socket::INET; +# +#my $ip = "127.0.0.1"; +#my $sock = new IO::Socket::INET ( LocalHost => $ip, LocalPort => '8040', Proto => 'tcp', Listen => 1, Reuse => 1 ); +#die "Could not create socket: $!\n" unless $sock; +# +#for(;;) { +# my $new_sock = $sock->accept(); +# my $pid = fork(); +# if ($pid) { +# close($new_sock); +# next; +# } +# +# my $host = $new_sock->sockhost(); +# my $fd = fileno($new_sock); +# +# my $con = new ESL::ESLconnection($fd); +# my $info = $con->getInfo(); +# +# print $info->serialize(); +# +# my $uuid = $info->getHeader("unique-id"); +# +# $con->execute("answer", "", $uuid); +# $con->execute("playback", "/ram/swimp.raw", $uuid); +# +# close($new_sock); +#} + +

1 0

[commit] r12204 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: rupa Date: Fri Feb 20 16:00:24 2009 New Revision: 12204 Log: handle case where custom_sql is braindead (no replaceable params) Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri Feb 20 16:00:24 2009 @@ -321,8 +321,8 @@ /* format the custom sql */ static char *format_custom_sql(const char *custom_sql, callback_t *cb_struct, const char *digits) { - char * tmpSQL; - char * newSQL; + char * tmpSQL = NULL; + char * newSQL = NULL; switch_channel_t *channel; /* first replace %s with digits to maintain backward compat */ @@ -352,7 +352,12 @@ if(tmpSQL != newSQL) { switch_safe_free(tmpSQL); } - return newSQL; + + if(newSQL == NULL) { + return (char *) custom_sql; + } else { + return newSQL; + } } static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata)

1 0