- Freeswitch-svn - FreeSWITCH Mailing Lists

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

25 Feb '09

Author: mikej Date: Wed Feb 25 00:26:03 2009 New Revision: 12273 Log: followup to svn rev12272 to fix x64 build Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj Wed Feb 25 00:26:03 2009 @@ -6,96 +6,49 @@ ProjectGUID="{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" RootNamespace="libspandsp" Keyword="Win32Proj" + TargetFrameworkVersion="131072" > - <Platforms> - <Platform + <Platforms> + <Platform Name="Win32" /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" - BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + 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" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="4" CompileAs="1" - DisableSpecificWarnings="4127;4244" + DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="./Debug\spandsp.lib" TargetMachine="1" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration + </Configuration> + <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" @@ -103,909 +56,268 @@ CharacterSet="1" WholeProgramOptimization="1" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + 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" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" - DisableSpecificWarnings="4127;4244" - /> - <Tool - Name="VCManagedResourceCompilerTool" + DisableSpecificWarnings="4127" /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="./Release\spandsp.lib" TargetMachine="1" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File - RelativePath="adsi.c" - > - </File> - <File - RelativePath="async.c" - > - </File> - <File - RelativePath="at_interpreter.c" - > - </File> - <File - RelativePath="awgn.c" - > - </File> - <File - RelativePath="bell_r2_mf.c" - > - </File> - <File - RelativePath="bert.c" - > - </File> - <File - RelativePath="bit_operations.c" - > - </File> - <File - RelativePath="bitstream.c" - > - </File> - <File - RelativePath="complex_filters.c" - > - </File> - <File - RelativePath="complex_vector_float.c" - > - </File> - <File - RelativePath="complex_vector_int.c" - > - </File> - <File - RelativePath="crc.c" - > - </File> - <File - RelativePath="dds_float.c" - > - </File> - <File - RelativePath="dds_int.c" - > - </File> - <File - RelativePath="dtmf.c" - > - </File> - <File - RelativePath="echo.c" - > - </File> - <File - RelativePath="fax.c" - > - </File> - <File - RelativePath="fax_modems.c" - > - </File> - <File - RelativePath="fsk.c" - > - </File> - <File - RelativePath="g711.c" - > - </File> - <File - RelativePath="g722.c" - > - </File> - <File - RelativePath="g726.c" - > - </File> - <File - RelativePath=".\msvc\gettimeofday.c" - > - </File> - <File - RelativePath="gsm0610_decode.c" - > - </File> - <File - RelativePath="gsm0610_encode.c" - > - </File> - <File - RelativePath="gsm0610_long_term.c" - > - </File> - <File - RelativePath="gsm0610_lpc.c" - > - </File> - <File - RelativePath="gsm0610_preprocess.c" - > - </File> - <File - RelativePath="gsm0610_rpe.c" - > - </File> - <File - RelativePath="gsm0610_short_term.c" - > - </File> - <File - RelativePath="hdlc.c" - > - </File> - <File - RelativePath="ima_adpcm.c" - > - </File> - <File - RelativePath="logging.c" - > - </File> - <File - RelativePath="lpc10_analyse.c" - > - </File> - <File - RelativePath="lpc10_decode.c" - > - </File> - <File - RelativePath="lpc10_encode.c" - > - </File> - <File - RelativePath="lpc10_placev.c" - > - </File> - <File - RelativePath="lpc10_voicing.c" - > - </File> - <File - RelativePath="modem_connect_tones.c" - > - </File> - <File - RelativePath="modem_echo.c" - > - </File> - <File - RelativePath="noise.c" - > - </File> - <File - RelativePath="oki_adpcm.c" - > - </File> - <File - RelativePath="playout.c" - > - </File> - <File - RelativePath="plc.c" - > - </File> - <File - RelativePath="power_meter.c" - > - </File> - <File - RelativePath="queue.c" - > - </File> - <File - RelativePath="schedule.c" - > - </File> - <File - RelativePath="sig_tone.c" - > - </File> - <File - RelativePath="silence_gen.c" - > - </File> - <File - RelativePath="super_tone_rx.c" - > - </File> - <File - RelativePath="super_tone_tx.c" - > - </File> - <File - RelativePath="t30.c" - > - </File> - <File - RelativePath="t30_api.c" - > - </File> - <File - RelativePath="t30_logging.c" - > - </File> - <File - RelativePath="t31.c" - > - </File> - <File - RelativePath="t35.c" - > - </File> - <File - RelativePath="t38_core.c" - > - </File> - <File - RelativePath="t38_gateway.c" - > - </File> - <File - RelativePath="t38_non_ecm_buffer.c" - > - </File> - <File - RelativePath="t38_terminal.c" - > - </File> - <File - RelativePath="t4.c" - > - </File> - <File - RelativePath="testcpuid.c" - > - </File> - <File - RelativePath="time_scale.c" - > - </File> - <File - RelativePath="tone_detect.c" - > - </File> - <File - RelativePath="tone_generate.c" - > - </File> - <File - RelativePath="v17rx.c" - > - </File> - <File - RelativePath="v17tx.c" - > - </File> - <File - RelativePath="v22bis_rx.c" - > - </File> - <File - RelativePath="v22bis_tx.c" - > - </File> - <File - RelativePath="v27ter_rx.c" - > - </File> - <File - RelativePath="v27ter_tx.c" - > - </File> - <File - RelativePath="v29rx.c" - > - </File> - <File - RelativePath="v29tx.c" - > - </File> - <File - RelativePath="v42.c" - > - </File> - <File - RelativePath="v42bis.c" - > - </File> - <File - RelativePath="v8.c" - > - </File> - <File - RelativePath="vector_float.c" - > - </File> - <File - RelativePath="vector_int.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - > - <File - RelativePath="spandsp.h" - > - </File> - <File - RelativePath="spandsp/adsi.h" - > - </File> - <File - RelativePath="spandsp/arctan2.h" - > - </File> - <File - RelativePath="spandsp/async.h" - > - </File> - <File - RelativePath="spandsp/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/awgn.h" - > - </File> - <File - RelativePath="spandsp/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/bert.h" - > - </File> - <File - RelativePath="spandsp/biquad.h" - > - </File> - <File - RelativePath="spandsp/bit_operations.h" - > - </File> - <File - RelativePath="spandsp/bitstream.h" - > - </File> - <File - RelativePath="spandsp/complex.h" - > - </File> - <File - RelativePath="spandsp/complex_filters.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_float.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_int.h" - > - </File> - <File - RelativePath="spandsp/crc.h" - > - </File> - <File - RelativePath="spandsp/dc_restore.h" - > - </File> - <File - RelativePath="spandsp/dds.h" - > - </File> - <File - RelativePath="spandsp/dtmf.h" - > - </File> - <File - RelativePath="spandsp/echo.h" - > - </File> - <File - RelativePath="spandsp/expose.h" - > - </File> - <File - RelativePath="spandsp/fast_convert.h" - > - </File> - <File - RelativePath="spandsp/fax.h" - > - </File> - <File - RelativePath="spandsp/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/fir.h" - > - </File> - <File - RelativePath="spandsp/fsk.h" - > - </File> - <File - RelativePath="spandsp/g168models.h" - > - </File> - <File - RelativePath="spandsp/g711.h" - > - </File> - <File - RelativePath="spandsp/g722.h" - > - </File> - <File - RelativePath="spandsp/g726.h" - > - </File> - <File - RelativePath="spandsp/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/hdlc.h" - > - </File> - <File - RelativePath="spandsp/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/logging.h" - > - </File> - <File - RelativePath="spandsp/lpc10.h" - > - </File> - <File - RelativePath="spandsp/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/modem_echo.h" - > - </File> - <File - RelativePath="spandsp/noise.h" - > - </File> - <File - RelativePath="spandsp/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/playout.h" - > - </File> - <File - RelativePath="spandsp/plc.h" - > - </File> - <File - RelativePath="spandsp/power_meter.h" - > - </File> - <File - RelativePath="spandsp/private/adsi.h" - > - </File> - <File - RelativePath="spandsp/private/async.h" - > - </File> - <File - RelativePath="spandsp/private/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/private/awgn.h" - > - </File> - <File - RelativePath="spandsp/private/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/private/bert.h" - > - </File> - <File - RelativePath="spandsp/private/bitstream.h" - > - </File> - <File - RelativePath="spandsp/private/dtmf.h" - > - </File> - <File - RelativePath="spandsp/private/fax.h" - > - </File> - <File - RelativePath="spandsp/private/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/private/fsk.h" - > - </File> - <File - RelativePath="spandsp/private/g711.h" - > - </File> - <File - RelativePath="spandsp/private/g722.h" - > - </File> - <File - RelativePath="spandsp/private/g726.h" - > - </File> - <File - RelativePath="spandsp/private/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/private/hdlc.h" - > - </File> - <File - RelativePath="spandsp/private/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/logging.h" - > - </File> - <File - RelativePath="spandsp/private/lpc10.h" - > - </File> - <File - RelativePath="spandsp/private/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/private/noise.h" - > - </File> - <File - RelativePath="spandsp/private/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/queue.h" - > - </File> - <File - RelativePath="spandsp/private/schedule.h" - > - </File> - <File - RelativePath="spandsp/private/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/private/t30.h" - > - </File> - <File - RelativePath="spandsp/private/t31.h" - > - </File> - <File - RelativePath="spandsp/private/t38_core.h" - > - </File> - <File - RelativePath="spandsp/private/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/private/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/private/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/private/t4.h" - > - </File> - <File - RelativePath="spandsp/private/time_scale.h" - > - </File> - <File - RelativePath="spandsp/private/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/private/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/private/v17rx.h" - > - </File> - <File - RelativePath="spandsp/private/v17tx.h" - > - </File> - <File - RelativePath="spandsp/private/v22bis.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/private/v29rx.h" - > - </File> - <File - RelativePath="spandsp/private/v29tx.h" - > - </File> - <File - RelativePath="spandsp/private/v42.h" - > - </File> - <File - RelativePath="spandsp/private/v42bis.h" - > - </File> - <File - RelativePath="spandsp/private/v8.h" - > - </File> - <File - RelativePath="spandsp/queue.h" - > - </File> - <File - RelativePath="spandsp/saturated.h" - > - </File> - <File - RelativePath="spandsp/schedule.h" - > - </File> - <File - RelativePath="spandsp/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/silence_gen.h" - > - </File> - <File - RelativePath="spandsp/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/t30.h" - > - </File> - <File - RelativePath="spandsp/t30_api.h" - > - </File> - <File - RelativePath="spandsp/t30_fcf.h" - > - </File> - <File - RelativePath="spandsp/t30_logging.h" - > - </File> - <File - RelativePath="spandsp/t31.h" - > - </File> - <File - RelativePath="spandsp/t35.h" - > - </File> - <File - RelativePath="spandsp/t38_core.h" - > - </File> - <File - RelativePath="spandsp/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/t4.h" - > - </File> - <File - RelativePath="spandsp/telephony.h" - > - </File> - <File - RelativePath="spandsp/time_scale.h" - > - </File> - <File - RelativePath="spandsp/timing.h" - > - </File> - <File - RelativePath="spandsp/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/v17rx.h" - > - </File> - <File - RelativePath="spandsp/v17tx.h" - > - </File> - <File - RelativePath="spandsp/v22bis.h" - > - </File> - <File - RelativePath="spandsp/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/v29rx.h" - > - </File> - <File - RelativePath="spandsp/v29tx.h" - > - </File> - <File - RelativePath="spandsp/v42.h" - > - </File> - <File - RelativePath="spandsp/v42bis.h" - > - </File> - <File - RelativePath="spandsp/v8.h" - > - </File> - <File - RelativePath="spandsp/vector_float.h" - > - </File> - <File - RelativePath="spandsp/vector_int.h" - > - </File> - <File - RelativePath="spandsp/version.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> +<File RelativePath="adsi.c"></File> +<File RelativePath="async.c"></File> +<File RelativePath="at_interpreter.c"></File> +<File RelativePath="awgn.c"></File> +<File RelativePath="bell_r2_mf.c"></File> +<File RelativePath="bert.c"></File> +<File RelativePath="bit_operations.c"></File> +<File RelativePath="bitstream.c"></File> +<File RelativePath="complex_filters.c"></File> +<File RelativePath="complex_vector_float.c"></File> +<File RelativePath="complex_vector_int.c"></File> +<File RelativePath="crc.c"></File> +<File RelativePath="dds_float.c"></File> +<File RelativePath="dds_int.c"></File> +<File RelativePath="dtmf.c"></File> +<File RelativePath="echo.c"></File> +<File RelativePath="fax.c"></File> +<File RelativePath="fax_modems.c"></File> +<File RelativePath="fsk.c"></File> +<File RelativePath="g711.c"></File> +<File RelativePath="g722.c"></File> +<File RelativePath="g726.c"></File> +<File RelativePath="gsm0610_decode.c"></File> +<File RelativePath="gsm0610_encode.c"></File> +<File RelativePath="gsm0610_long_term.c"></File> +<File RelativePath="gsm0610_lpc.c"></File> +<File RelativePath="gsm0610_preprocess.c"></File> +<File RelativePath="gsm0610_rpe.c"></File> +<File RelativePath="gsm0610_short_term.c"></File> +<File RelativePath="hdlc.c"></File> +<File RelativePath="ima_adpcm.c"></File> +<File RelativePath="logging.c"></File> +<File RelativePath="lpc10_analyse.c"></File> +<File RelativePath="lpc10_decode.c"></File> +<File RelativePath="lpc10_encode.c"></File> +<File RelativePath="lpc10_placev.c"></File> +<File RelativePath="lpc10_voicing.c"></File> +<File RelativePath="modem_echo.c"></File> +<File RelativePath="modem_connect_tones.c"></File> +<File RelativePath="noise.c"></File> +<File RelativePath="oki_adpcm.c"></File> +<File RelativePath="playout.c"></File> +<File RelativePath="plc.c"></File> +<File RelativePath="power_meter.c"></File> +<File RelativePath="queue.c"></File> +<File RelativePath="schedule.c"></File> +<File RelativePath="sig_tone.c"></File> +<File RelativePath="silence_gen.c"></File> +<File RelativePath="super_tone_rx.c"></File> +<File RelativePath="super_tone_tx.c"></File> +<File RelativePath="t4.c"></File> +<File RelativePath="t30.c"></File> +<File RelativePath="t30_api.c"></File> +<File RelativePath="t30_logging.c"></File> +<File RelativePath="t31.c"></File> +<File RelativePath="t35.c"></File> +<File RelativePath="t38_core.c"></File> +<File RelativePath="t38_gateway.c"></File> +<File RelativePath="t38_non_ecm_buffer.c"></File> +<File RelativePath="t38_terminal.c"></File> +<File RelativePath="testcpuid.c"></File> +<File RelativePath="time_scale.c"></File> +<File RelativePath="tone_detect.c"></File> +<File RelativePath="tone_generate.c"></File> +<File RelativePath="v17rx.c"></File> +<File RelativePath="v17tx.c"></File> +<File RelativePath="v22bis_rx.c"></File> +<File RelativePath="v22bis_tx.c"></File> +<File RelativePath="v27ter_rx.c"></File> +<File RelativePath="v27ter_tx.c"></File> +<File RelativePath="v29rx.c"></File> +<File RelativePath="v29tx.c"></File> +<File RelativePath="v42.c"></File> +<File RelativePath="v42bis.c"></File> +<File RelativePath="v8.c"></File> +<File RelativePath="vector_float.c"></File> +<File RelativePath="vector_int.c"></File> +<File RelativePath=".\msvc\gettimeofday.c"></File> +</Filter><Filter Name="Header Files"> +<File RelativePath="spandsp/adsi.h"></File> +<File RelativePath="spandsp/async.h"></File> +<File RelativePath="spandsp/arctan2.h"></File> +<File RelativePath="spandsp/at_interpreter.h"></File> +<File RelativePath="spandsp/awgn.h"></File> +<File RelativePath="spandsp/bell_r2_mf.h"></File> +<File RelativePath="spandsp/bert.h"></File> +<File RelativePath="spandsp/biquad.h"></File> +<File RelativePath="spandsp/bit_operations.h"></File> +<File RelativePath="spandsp/bitstream.h"></File> +<File RelativePath="spandsp/crc.h"></File> +<File RelativePath="spandsp/complex.h"></File> +<File RelativePath="spandsp/complex_filters.h"></File> +<File RelativePath="spandsp/complex_vector_float.h"></File> +<File RelativePath="spandsp/complex_vector_int.h"></File> +<File RelativePath="spandsp/dc_restore.h"></File> +<File RelativePath="spandsp/dds.h"></File> +<File RelativePath="spandsp/dtmf.h"></File> +<File RelativePath="spandsp/echo.h"></File> +<File RelativePath="spandsp/fast_convert.h"></File> +<File RelativePath="spandsp/fax.h"></File> +<File RelativePath="spandsp/fax_modems.h"></File> +<File RelativePath="spandsp/fir.h"></File> +<File RelativePath="spandsp/fsk.h"></File> +<File RelativePath="spandsp/g168models.h"></File> +<File RelativePath="spandsp/g711.h"></File> +<File RelativePath="spandsp/g722.h"></File> +<File RelativePath="spandsp/g726.h"></File> +<File RelativePath="spandsp/gsm0610.h"></File> +<File RelativePath="spandsp/hdlc.h"></File> +<File RelativePath="spandsp/ima_adpcm.h"></File> +<File RelativePath="spandsp/logging.h"></File> +<File RelativePath="spandsp/lpc10.h"></File> +<File RelativePath="spandsp/modem_echo.h"></File> +<File RelativePath="spandsp/modem_connect_tones.h"></File> +<File RelativePath="spandsp/noise.h"></File> +<File RelativePath="spandsp/oki_adpcm.h"></File> +<File RelativePath="spandsp/playout.h"></File> +<File RelativePath="spandsp/plc.h"></File> +<File RelativePath="spandsp/power_meter.h"></File> +<File RelativePath="spandsp/queue.h"></File> +<File RelativePath="spandsp/saturated.h"></File> +<File RelativePath="spandsp/schedule.h"></File> +<File RelativePath="spandsp/sig_tone.h"></File> +<File RelativePath="spandsp/silence_gen.h"></File> +<File RelativePath="spandsp/super_tone_rx.h"></File> +<File RelativePath="spandsp/super_tone_tx.h"></File> +<File RelativePath="spandsp/t4.h"></File> +<File RelativePath="spandsp/t30.h"></File> +<File RelativePath="spandsp/t30_api.h"></File> +<File RelativePath="spandsp/t30_fcf.h"></File> +<File RelativePath="spandsp/t30_logging.h"></File> +<File RelativePath="spandsp/t31.h"></File> +<File RelativePath="spandsp/t35.h"></File> +<File RelativePath="spandsp/t38_core.h"></File> +<File RelativePath="spandsp/t38_gateway.h"></File> +<File RelativePath="spandsp/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/t38_terminal.h"></File> +<File RelativePath="spandsp/telephony.h"></File> +<File RelativePath="spandsp/time_scale.h"></File> +<File RelativePath="spandsp/timing.h"></File> +<File RelativePath="spandsp/tone_detect.h"></File> +<File RelativePath="spandsp/tone_generate.h"></File> +<File RelativePath="spandsp/v17rx.h"></File> +<File RelativePath="spandsp/v17tx.h"></File> +<File RelativePath="spandsp/v22bis.h"></File> +<File RelativePath="spandsp/v27ter_rx.h"></File> +<File RelativePath="spandsp/v27ter_tx.h"></File> +<File RelativePath="spandsp/v29rx.h"></File> +<File RelativePath="spandsp/v29tx.h"></File> +<File RelativePath="spandsp/v42.h"></File> +<File RelativePath="spandsp/v42bis.h"></File> +<File RelativePath="spandsp/v8.h"></File> +<File RelativePath="spandsp/vector_float.h"></File> +<File RelativePath="spandsp/vector_int.h"></File> +<File RelativePath="spandsp/version.h"></File> +<File RelativePath="spandsp/private/adsi.h"></File> +<File RelativePath="spandsp/private/async.h"></File> +<File RelativePath="spandsp/private/at_interpreter.h"></File> +<File RelativePath="spandsp/private/awgn.h"></File> +<File RelativePath="spandsp/private/bell_r2_mf.h"></File> +<File RelativePath="spandsp/private/bert.h"></File> +<File RelativePath="spandsp/private/bitstream.h"></File> +<File RelativePath="spandsp/private/dtmf.h"></File> +<File RelativePath="spandsp/private/fax.h"></File> +<File RelativePath="spandsp/private/fax_modems.h"></File> +<File RelativePath="spandsp/private/fsk.h"></File> +<File RelativePath="spandsp/private/g711.h"></File> +<File RelativePath="spandsp/private/g722.h"></File> +<File RelativePath="spandsp/private/g726.h"></File> +<File RelativePath="spandsp/private/gsm0610.h"></File> +<File RelativePath="spandsp/private/hdlc.h"></File> +<File RelativePath="spandsp/private/ima_adpcm.h"></File> +<File RelativePath="spandsp/private/logging.h"></File> +<File RelativePath="spandsp/private/lpc10.h"></File> +<File RelativePath="spandsp/private/modem_connect_tones.h"></File> +<File RelativePath="spandsp/private/noise.h"></File> +<File RelativePath="spandsp/private/oki_adpcm.h"></File> +<File RelativePath="spandsp/private/queue.h"></File> +<File RelativePath="spandsp/private/schedule.h"></File> +<File RelativePath="spandsp/private/sig_tone.h"></File> +<File RelativePath="spandsp/private/super_tone_rx.h"></File> +<File RelativePath="spandsp/private/super_tone_tx.h"></File> +<File RelativePath="spandsp/private/t30.h"></File> +<File RelativePath="spandsp/private/t31.h"></File> +<File RelativePath="spandsp/private/t38_core.h"></File> +<File RelativePath="spandsp/private/t38_gateway.h"></File> +<File RelativePath="spandsp/private/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/private/t38_terminal.h"></File> +<File RelativePath="spandsp/private/t4.h"></File> +<File RelativePath="spandsp/private/time_scale.h"></File> +<File RelativePath="spandsp/private/tone_detect.h"></File> +<File RelativePath="spandsp/private/tone_generate.h"></File> +<File RelativePath="spandsp/private/v17rx.h"></File> +<File RelativePath="spandsp/private/v17tx.h"></File> +<File RelativePath="spandsp/private/v22bis.h"></File> +<File RelativePath="spandsp/private/v27ter_rx.h"></File> +<File RelativePath="spandsp/private/v27ter_tx.h"></File> +<File RelativePath="spandsp/private/v29rx.h"></File> +<File RelativePath="spandsp/private/v29tx.h"></File> +<File RelativePath="spandsp/private/v42.h"></File> +<File RelativePath="spandsp/private/v42bis.h"></File> +<File RelativePath="spandsp/private/v8.h"></File> +<File RelativePath="spandsp/expose.h"></File> +<File RelativePath="spandsp.h"></File> + </Filter> + <File + RelativePath=".\msvc\spandsp.h" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> 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 Wed Feb 25 00:26:03 2009 @@ -8,65 +8,39 @@ Keyword="Win32Proj" TargetFrameworkVersion="131072" > - <Platforms> - <Platform + <Platforms> + <Platform Name="Win32" /> - <Platform + <Platform Name="x64" /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" - BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + 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" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="4" CompileAs="1" DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="2" GenerateDebugInformation="true" @@ -76,73 +50,26 @@ ImportLibrary="./Debug\spandsp.lib" TargetMachine="1" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration + </Configuration> + <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" WholeProgramOptimization="1" - BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + 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" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="1" GenerateDebugInformation="true" @@ -154,51 +81,15 @@ ImportLibrary="./Release\spandsp.lib" TargetMachine="1" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration + </Configuration> + <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" @@ -212,16 +103,7 @@ CompileAs="1" DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="2" GenerateDebugInformation="true" @@ -231,29 +113,8 @@ ImportLibrary="$(TargetDir)spandsp.lib" TargetMachine="17" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration + </Configuration> + <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" @@ -261,22 +122,7 @@ CharacterSet="1" WholeProgramOptimization="1" > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool + <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" @@ -286,16 +132,7 @@ DebugInformationFormat="3" DisableSpecificWarnings="4127" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool + <Tool Name="VCLinkerTool" LinkIncremental="1" GenerateDebugInformation="true" @@ -307,879 +144,266 @@ ImportLibrary="$(TargetDir)spandsp.lib" TargetMachine="17" /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File - RelativePath="adsi.c" - > - </File> - <File - RelativePath="async.c" - > - </File> - <File - RelativePath="at_interpreter.c" - > - </File> - <File - RelativePath="awgn.c" - > - </File> - <File - RelativePath="bell_r2_mf.c" - > - </File> - <File - RelativePath="bert.c" - > - </File> - <File - RelativePath="bit_operations.c" - > - </File> - <File - RelativePath="bitstream.c" - > - </File> - <File - RelativePath="complex_filters.c" - > - </File> - <File - RelativePath="complex_vector_float.c" - > - </File> - <File - RelativePath="complex_vector_int.c" - > - </File> - <File - RelativePath="crc.c" - > - </File> - <File - RelativePath="dds_float.c" - > - </File> - <File - RelativePath="dds_int.c" - > - </File> - <File - RelativePath="dtmf.c" - > - </File> - <File - RelativePath="echo.c" - > - </File> - <File - RelativePath="fax.c" - > - </File> - <File - RelativePath="fax_modems.c" - > - </File> - <File - RelativePath="fsk.c" - > - </File> - <File - RelativePath="g711.c" - > - </File> - <File - RelativePath="g722.c" - > - </File> - <File - RelativePath="g726.c" - > - </File> - <File - RelativePath=".\msvc\gettimeofday.c" - > - </File> - <File - RelativePath="gsm0610_decode.c" - > - </File> - <File - RelativePath="gsm0610_encode.c" - > - </File> - <File - RelativePath="gsm0610_long_term.c" - > - </File> - <File - RelativePath="gsm0610_lpc.c" - > - </File> - <File - RelativePath="gsm0610_preprocess.c" - > - </File> - <File - RelativePath="gsm0610_rpe.c" - > - </File> - <File - RelativePath="gsm0610_short_term.c" - > - </File> - <File - RelativePath="hdlc.c" - > - </File> - <File - RelativePath="ima_adpcm.c" - > - </File> - <File - RelativePath="logging.c" - > - </File> - <File - RelativePath="lpc10_analyse.c" - > - </File> - <File - RelativePath="lpc10_decode.c" - > - </File> - <File - RelativePath="lpc10_encode.c" - > - </File> - <File - RelativePath="lpc10_placev.c" - > - </File> - <File - RelativePath="lpc10_voicing.c" - > - </File> - <File - RelativePath="modem_connect_tones.c" - > - </File> - <File - RelativePath="modem_echo.c" - > - </File> - <File - RelativePath="noise.c" - > - </File> - <File - RelativePath="oki_adpcm.c" - > - </File> - <File - RelativePath="playout.c" - > - </File> - <File - RelativePath="plc.c" - > - </File> - <File - RelativePath="power_meter.c" - > - </File> - <File - RelativePath="queue.c" - > - </File> - <File - RelativePath="schedule.c" - > - </File> - <File - RelativePath="sig_tone.c" - > - </File> - <File - RelativePath="silence_gen.c" - > - </File> - <File - RelativePath="super_tone_rx.c" - > - </File> - <File - RelativePath="super_tone_tx.c" - > - </File> - <File - RelativePath="t30.c" - > - </File> - <File - RelativePath="t30_api.c" - > - </File> - <File - RelativePath="t30_logging.c" - > - </File> - <File - RelativePath="t31.c" - > - </File> - <File - RelativePath="t35.c" - > - </File> - <File - RelativePath="t38_core.c" - > - </File> - <File - RelativePath="t38_gateway.c" - > - </File> - <File - RelativePath="t38_non_ecm_buffer.c" - > - </File> - <File - RelativePath="t38_terminal.c" - > - </File> - <File - RelativePath="t4.c" - > - </File> - <File - RelativePath="testcpuid.c" - > - </File> - <File - RelativePath="time_scale.c" - > - </File> - <File - RelativePath="tone_detect.c" - > - </File> - <File - RelativePath="tone_generate.c" - > - </File> - <File - RelativePath="v17rx.c" - > - </File> - <File - RelativePath="v17tx.c" - > - </File> - <File - RelativePath="v22bis_rx.c" - > - </File> - <File - RelativePath="v22bis_tx.c" - > - </File> - <File - RelativePath="v27ter_rx.c" - > - </File> - <File - RelativePath="v27ter_tx.c" - > - </File> - <File - RelativePath="v29rx.c" - > - </File> - <File - RelativePath="v29tx.c" - > - </File> - <File - RelativePath="v42.c" - > - </File> - <File - RelativePath="v42bis.c" - > - </File> - <File - RelativePath="v8.c" - > - </File> - <File - RelativePath="vector_float.c" - > - </File> - <File - RelativePath="vector_int.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - > - <File - RelativePath="spandsp.h" - > - </File> - <File - RelativePath="spandsp/adsi.h" - > - </File> - <File - RelativePath="spandsp/arctan2.h" - > - </File> - <File - RelativePath="spandsp/async.h" - > - </File> - <File - RelativePath="spandsp/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/awgn.h" - > - </File> - <File - RelativePath="spandsp/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/bert.h" - > - </File> - <File - RelativePath="spandsp/biquad.h" - > - </File> - <File - RelativePath="spandsp/bit_operations.h" - > - </File> - <File - RelativePath="spandsp/bitstream.h" - > - </File> - <File - RelativePath="spandsp/complex.h" - > - </File> - <File - RelativePath="spandsp/complex_filters.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_float.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_int.h" - > - </File> - <File - RelativePath="spandsp/crc.h" - > - </File> - <File - RelativePath="spandsp/dc_restore.h" - > - </File> - <File - RelativePath="spandsp/dds.h" - > - </File> - <File - RelativePath="spandsp/dtmf.h" - > - </File> - <File - RelativePath="spandsp/echo.h" - > - </File> - <File - RelativePath="spandsp/expose.h" - > - </File> - <File - RelativePath="spandsp/fast_convert.h" - > - </File> - <File - RelativePath="spandsp/fax.h" - > - </File> - <File - RelativePath="spandsp/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/fir.h" - > - </File> - <File - RelativePath="spandsp/fsk.h" - > - </File> - <File - RelativePath="spandsp/g168models.h" - > - </File> - <File - RelativePath="spandsp/g711.h" - > - </File> - <File - RelativePath="spandsp/g722.h" - > - </File> - <File - RelativePath="spandsp/g726.h" - > - </File> - <File - RelativePath="spandsp/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/hdlc.h" - > - </File> - <File - RelativePath="spandsp/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/logging.h" - > - </File> - <File - RelativePath="spandsp/lpc10.h" - > - </File> - <File - RelativePath="spandsp/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/modem_echo.h" - > - </File> - <File - RelativePath="spandsp/noise.h" - > - </File> - <File - RelativePath="spandsp/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/playout.h" - > - </File> - <File - RelativePath="spandsp/plc.h" - > - </File> - <File - RelativePath="spandsp/power_meter.h" - > - </File> - <File - RelativePath="spandsp/private/adsi.h" - > - </File> - <File - RelativePath="spandsp/private/async.h" - > - </File> - <File - RelativePath="spandsp/private/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/private/awgn.h" - > - </File> - <File - RelativePath="spandsp/private/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/private/bert.h" - > - </File> - <File - RelativePath="spandsp/private/bitstream.h" - > - </File> - <File - RelativePath="spandsp/private/dtmf.h" - > - </File> - <File - RelativePath="spandsp/private/fax.h" - > - </File> - <File - RelativePath="spandsp/private/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/private/fsk.h" - > - </File> - <File - RelativePath="spandsp/private/g711.h" - > - </File> - <File - RelativePath="spandsp/private/g722.h" - > - </File> - <File - RelativePath="spandsp/private/g726.h" - > - </File> - <File - RelativePath="spandsp/private/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/private/hdlc.h" - > - </File> - <File - RelativePath="spandsp/private/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/logging.h" - > - </File> - <File - RelativePath="spandsp/private/lpc10.h" - > - </File> - <File - RelativePath="spandsp/private/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/private/noise.h" - > - </File> - <File - RelativePath="spandsp/private/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/queue.h" - > - </File> - <File - RelativePath="spandsp/private/schedule.h" - > - </File> - <File - RelativePath="spandsp/private/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/private/t30.h" - > - </File> - <File - RelativePath="spandsp/private/t31.h" - > - </File> - <File - RelativePath="spandsp/private/t38_core.h" - > - </File> - <File - RelativePath="spandsp/private/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/private/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/private/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/private/t4.h" - > - </File> - <File - RelativePath="spandsp/private/time_scale.h" - > - </File> - <File - RelativePath="spandsp/private/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/private/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/private/v17rx.h" - > - </File> - <File - RelativePath="spandsp/private/v17tx.h" - > - </File> - <File - RelativePath="spandsp/private/v22bis.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/private/v29rx.h" - > - </File> - <File - RelativePath="spandsp/private/v29tx.h" - > - </File> - <File - RelativePath="spandsp/private/v42.h" - > - </File> - <File - RelativePath="spandsp/private/v42bis.h" - > - </File> - <File - RelativePath="spandsp/private/v8.h" - > - </File> - <File - RelativePath="spandsp/queue.h" - > - </File> - <File - RelativePath="spandsp/saturated.h" - > - </File> - <File - RelativePath="spandsp/schedule.h" - > - </File> - <File - RelativePath="spandsp/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/silence_gen.h" - > - </File> - <File - RelativePath="spandsp/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/t30.h" - > - </File> - <File - RelativePath="spandsp/t30_api.h" - > - </File> - <File - RelativePath="spandsp/t30_fcf.h" - > - </File> - <File - RelativePath="spandsp/t30_logging.h" - > - </File> - <File - RelativePath="spandsp/t31.h" - > - </File> - <File - RelativePath="spandsp/t35.h" - > - </File> - <File - RelativePath="spandsp/t38_core.h" - > - </File> - <File - RelativePath="spandsp/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/t4.h" - > - </File> - <File - RelativePath="spandsp/telephony.h" - > - </File> - <File - RelativePath="spandsp/time_scale.h" - > - </File> - <File - RelativePath="spandsp/timing.h" - > - </File> - <File - RelativePath="spandsp/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/v17rx.h" - > - </File> - <File - RelativePath="spandsp/v17tx.h" - > - </File> - <File - RelativePath="spandsp/v22bis.h" - > - </File> - <File - RelativePath="spandsp/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/v29rx.h" - > - </File> - <File - RelativePath="spandsp/v29tx.h" - > - </File> - <File - RelativePath="spandsp/v42.h" - > - </File> - <File - RelativePath="spandsp/v42bis.h" - > - </File> - <File - RelativePath="spandsp/v8.h" - > - </File> - <File - RelativePath="spandsp/vector_float.h" - > - </File> - <File - RelativePath="spandsp/vector_int.h" - > - </File> - <File - RelativePath="spandsp/version.h" - > - </File> - </Filter> - <File - RelativePath=".\msvc\spandsp.h" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" - CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" - Outputs="$(SolutionDir)$(InputFileName)" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<File RelativePath="adsi.c"></File> +<File RelativePath="async.c"></File> +<File RelativePath="at_interpreter.c"></File> +<File RelativePath="awgn.c"></File> +<File RelativePath="bell_r2_mf.c"></File> +<File RelativePath="bert.c"></File> +<File RelativePath="bit_operations.c"></File> +<File RelativePath="bitstream.c"></File> +<File RelativePath="complex_filters.c"></File> +<File RelativePath="complex_vector_float.c"></File> +<File RelativePath="complex_vector_int.c"></File> +<File RelativePath="crc.c"></File> +<File RelativePath="dds_float.c"></File> +<File RelativePath="dds_int.c"></File> +<File RelativePath="dtmf.c"></File> +<File RelativePath="echo.c"></File> +<File RelativePath="fax.c"></File> +<File RelativePath="fax_modems.c"></File> +<File RelativePath="fsk.c"></File> +<File RelativePath="g711.c"></File> +<File RelativePath="g722.c"></File> +<File RelativePath="g726.c"></File> +<File RelativePath="gsm0610_decode.c"></File> +<File RelativePath="gsm0610_encode.c"></File> +<File RelativePath="gsm0610_long_term.c"></File> +<File RelativePath="gsm0610_lpc.c"></File> +<File RelativePath="gsm0610_preprocess.c"></File> +<File RelativePath="gsm0610_rpe.c"></File> +<File RelativePath="gsm0610_short_term.c"></File> +<File RelativePath="hdlc.c"></File> +<File RelativePath="ima_adpcm.c"></File> +<File RelativePath="logging.c"></File> +<File RelativePath="lpc10_analyse.c"></File> +<File RelativePath="lpc10_decode.c"></File> +<File RelativePath="lpc10_encode.c"></File> +<File RelativePath="lpc10_placev.c"></File> +<File RelativePath="lpc10_voicing.c"></File> +<File RelativePath="modem_echo.c"></File> +<File RelativePath="modem_connect_tones.c"></File> +<File RelativePath="noise.c"></File> +<File RelativePath="oki_adpcm.c"></File> +<File RelativePath="playout.c"></File> +<File RelativePath="plc.c"></File> +<File RelativePath="power_meter.c"></File> +<File RelativePath="queue.c"></File> +<File RelativePath="schedule.c"></File> +<File RelativePath="sig_tone.c"></File> +<File RelativePath="silence_gen.c"></File> +<File RelativePath="super_tone_rx.c"></File> +<File RelativePath="super_tone_tx.c"></File> +<File RelativePath="t4.c"></File> +<File RelativePath="t30.c"></File> +<File RelativePath="t30_api.c"></File> +<File RelativePath="t30_logging.c"></File> +<File RelativePath="t31.c"></File> +<File RelativePath="t35.c"></File> +<File RelativePath="t38_core.c"></File> +<File RelativePath="t38_gateway.c"></File> +<File RelativePath="t38_non_ecm_buffer.c"></File> +<File RelativePath="t38_terminal.c"></File> +<File RelativePath="testcpuid.c"></File> +<File RelativePath="time_scale.c"></File> +<File RelativePath="tone_detect.c"></File> +<File RelativePath="tone_generate.c"></File> +<File RelativePath="v17rx.c"></File> +<File RelativePath="v17tx.c"></File> +<File RelativePath="v22bis_rx.c"></File> +<File RelativePath="v22bis_tx.c"></File> +<File RelativePath="v27ter_rx.c"></File> +<File RelativePath="v27ter_tx.c"></File> +<File RelativePath="v29rx.c"></File> +<File RelativePath="v29tx.c"></File> +<File RelativePath="v42.c"></File> +<File RelativePath="v42bis.c"></File> +<File RelativePath="v8.c"></File> +<File RelativePath="vector_float.c"></File> +<File RelativePath="vector_int.c"></File> +<File RelativePath=".\msvc\gettimeofday.c"></File> +</Filter><Filter Name="Header Files"> +<File RelativePath="spandsp/adsi.h"></File> +<File RelativePath="spandsp/async.h"></File> +<File RelativePath="spandsp/arctan2.h"></File> +<File RelativePath="spandsp/at_interpreter.h"></File> +<File RelativePath="spandsp/awgn.h"></File> +<File RelativePath="spandsp/bell_r2_mf.h"></File> +<File RelativePath="spandsp/bert.h"></File> +<File RelativePath="spandsp/biquad.h"></File> +<File RelativePath="spandsp/bit_operations.h"></File> +<File RelativePath="spandsp/bitstream.h"></File> +<File RelativePath="spandsp/crc.h"></File> +<File RelativePath="spandsp/complex.h"></File> +<File RelativePath="spandsp/complex_filters.h"></File> +<File RelativePath="spandsp/complex_vector_float.h"></File> +<File RelativePath="spandsp/complex_vector_int.h"></File> +<File RelativePath="spandsp/dc_restore.h"></File> +<File RelativePath="spandsp/dds.h"></File> +<File RelativePath="spandsp/dtmf.h"></File> +<File RelativePath="spandsp/echo.h"></File> +<File RelativePath="spandsp/fast_convert.h"></File> +<File RelativePath="spandsp/fax.h"></File> +<File RelativePath="spandsp/fax_modems.h"></File> +<File RelativePath="spandsp/fir.h"></File> +<File RelativePath="spandsp/fsk.h"></File> +<File RelativePath="spandsp/g168models.h"></File> +<File RelativePath="spandsp/g711.h"></File> +<File RelativePath="spandsp/g722.h"></File> +<File RelativePath="spandsp/g726.h"></File> +<File RelativePath="spandsp/gsm0610.h"></File> +<File RelativePath="spandsp/hdlc.h"></File> +<File RelativePath="spandsp/ima_adpcm.h"></File> +<File RelativePath="spandsp/logging.h"></File> +<File RelativePath="spandsp/lpc10.h"></File> +<File RelativePath="spandsp/modem_echo.h"></File> +<File RelativePath="spandsp/modem_connect_tones.h"></File> +<File RelativePath="spandsp/noise.h"></File> +<File RelativePath="spandsp/oki_adpcm.h"></File> +<File RelativePath="spandsp/playout.h"></File> +<File RelativePath="spandsp/plc.h"></File> +<File RelativePath="spandsp/power_meter.h"></File> +<File RelativePath="spandsp/queue.h"></File> +<File RelativePath="spandsp/saturated.h"></File> +<File RelativePath="spandsp/schedule.h"></File> +<File RelativePath="spandsp/sig_tone.h"></File> +<File RelativePath="spandsp/silence_gen.h"></File> +<File RelativePath="spandsp/super_tone_rx.h"></File> +<File RelativePath="spandsp/super_tone_tx.h"></File> +<File RelativePath="spandsp/t4.h"></File> +<File RelativePath="spandsp/t30.h"></File> +<File RelativePath="spandsp/t30_api.h"></File> +<File RelativePath="spandsp/t30_fcf.h"></File> +<File RelativePath="spandsp/t30_logging.h"></File> +<File RelativePath="spandsp/t31.h"></File> +<File RelativePath="spandsp/t35.h"></File> +<File RelativePath="spandsp/t38_core.h"></File> +<File RelativePath="spandsp/t38_gateway.h"></File> +<File RelativePath="spandsp/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/t38_terminal.h"></File> +<File RelativePath="spandsp/telephony.h"></File> +<File RelativePath="spandsp/time_scale.h"></File> +<File RelativePath="spandsp/timing.h"></File> +<File RelativePath="spandsp/tone_detect.h"></File> +<File RelativePath="spandsp/tone_generate.h"></File> +<File RelativePath="spandsp/v17rx.h"></File> +<File RelativePath="spandsp/v17tx.h"></File> +<File RelativePath="spandsp/v22bis.h"></File> +<File RelativePath="spandsp/v27ter_rx.h"></File> +<File RelativePath="spandsp/v27ter_tx.h"></File> +<File RelativePath="spandsp/v29rx.h"></File> +<File RelativePath="spandsp/v29tx.h"></File> +<File RelativePath="spandsp/v42.h"></File> +<File RelativePath="spandsp/v42bis.h"></File> +<File RelativePath="spandsp/v8.h"></File> +<File RelativePath="spandsp/vector_float.h"></File> +<File RelativePath="spandsp/vector_int.h"></File> +<File RelativePath="spandsp/version.h"></File> +<File RelativePath="spandsp/private/adsi.h"></File> +<File RelativePath="spandsp/private/async.h"></File> +<File RelativePath="spandsp/private/at_interpreter.h"></File> +<File RelativePath="spandsp/private/awgn.h"></File> +<File RelativePath="spandsp/private/bell_r2_mf.h"></File> +<File RelativePath="spandsp/private/bert.h"></File> +<File RelativePath="spandsp/private/bitstream.h"></File> +<File RelativePath="spandsp/private/dtmf.h"></File> +<File RelativePath="spandsp/private/fax.h"></File> +<File RelativePath="spandsp/private/fax_modems.h"></File> +<File RelativePath="spandsp/private/fsk.h"></File> +<File RelativePath="spandsp/private/g711.h"></File> +<File RelativePath="spandsp/private/g722.h"></File> +<File RelativePath="spandsp/private/g726.h"></File> +<File RelativePath="spandsp/private/gsm0610.h"></File> +<File RelativePath="spandsp/private/hdlc.h"></File> +<File RelativePath="spandsp/private/ima_adpcm.h"></File> +<File RelativePath="spandsp/private/logging.h"></File> +<File RelativePath="spandsp/private/lpc10.h"></File> +<File RelativePath="spandsp/private/modem_connect_tones.h"></File> +<File RelativePath="spandsp/private/noise.h"></File> +<File RelativePath="spandsp/private/oki_adpcm.h"></File> +<File RelativePath="spandsp/private/queue.h"></File> +<File RelativePath="spandsp/private/schedule.h"></File> +<File RelativePath="spandsp/private/sig_tone.h"></File> +<File RelativePath="spandsp/private/super_tone_rx.h"></File> +<File RelativePath="spandsp/private/super_tone_tx.h"></File> +<File RelativePath="spandsp/private/t30.h"></File> +<File RelativePath="spandsp/private/t31.h"></File> +<File RelativePath="spandsp/private/t38_core.h"></File> +<File RelativePath="spandsp/private/t38_gateway.h"></File> +<File RelativePath="spandsp/private/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/private/t38_terminal.h"></File> +<File RelativePath="spandsp/private/t4.h"></File> +<File RelativePath="spandsp/private/time_scale.h"></File> +<File RelativePath="spandsp/private/tone_detect.h"></File> +<File RelativePath="spandsp/private/tone_generate.h"></File> +<File RelativePath="spandsp/private/v17rx.h"></File> +<File RelativePath="spandsp/private/v17tx.h"></File> +<File RelativePath="spandsp/private/v22bis.h"></File> +<File RelativePath="spandsp/private/v27ter_rx.h"></File> +<File RelativePath="spandsp/private/v27ter_tx.h"></File> +<File RelativePath="spandsp/private/v29rx.h"></File> +<File RelativePath="spandsp/private/v29tx.h"></File> +<File RelativePath="spandsp/private/v42.h"></File> +<File RelativePath="spandsp/private/v42bis.h"></File> +<File RelativePath="spandsp/private/v8.h"></File> +<File RelativePath="spandsp/expose.h"></File> +<File RelativePath="spandsp.h"></File> + </Filter> + <File + RelativePath=".\msvc\spandsp.h" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Wed Feb 25 00:26:03 2009 @@ -22,6 +22,26 @@ Outputs="$(SolutionDir)$(InputFileName)" /> </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> </File> </Files> <Globals>

1 0

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

25 Feb '09

Author: robertj Date: Tue Feb 24 23:45:36 2009 New Revision: 12272 Log: Added missing dependency on header file generator programs in 2005 solution file. Shuffled where various compatibility items of code are amongst the headers in msvc directory so: Not too many warnings are disabled in source file that includes spandsp.h A copy of the msvc/spandsp.h file to spandsp/src directory so project that uses it only needs to add one directory to search, or can even just explicitly put the path in for the spandsp.h file. Removal of need for windows.h to be implicitly included by user source file via spandsp.h, can cause conflicts. Some symbol conflicts with other libraries. Removed: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj freeswitch/trunk/libs/spandsp/src/msvc/config.h freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h freeswitch/trunk/libs/spandsp/src/msvc/unistd.h freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Tue Feb 24 23:45:36 2009 @@ -467,12 +467,12 @@ $(srcdir)/msvc/spandsp.h: spandsp.h.in echo "creating $(srcdir)/msvc/spandsp.h" - @cp $(srcdir)/spandsp.h.in $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@INSERT_INTTYPES_HEADER\@/#include <inttypes.h>/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(srcdir)/msvc/spandsp.h + @sed -e "s/#define _SPANDSP_H_/#define _SPANDSP_H_\n\n#define __inline__ __inline\n#pragma warning(disable:4200)/" \ + -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" \ + -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" \ + -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" \ + -e "s/\@INSERT_INTTYPES_HEADER\@/#include <msvc\/inttypes.h>/" \ + -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(srcdir)/spandsp.h.in > $(srcdir)/msvc/spandsp.h spandsp/version.h: NOWDATE=`date --utc +"%Y%m%d"` ; \ 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 Tue Feb 24 23:45:36 2009 @@ -29,10 +29,12 @@ {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}.Debug|Win32.Build.0 = 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}.Debug|Win32.Build.0 = 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 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 Tue Feb 24 23:45:36 2009 @@ -99,11 +99,13 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" + WholeProgramOptimization="1" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -122,16 +124,13 @@ /> <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" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + RuntimeLibrary="2" UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" - CompileAs="1" DisableSpecificWarnings="4127" /> <Tool @@ -145,13 +144,15 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="2" + LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary="$(TargetDir)spandsp.lib" - TargetMachine="17" + ImportLibrary="./Release\spandsp.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -176,13 +177,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)Release" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" - WholeProgramOptimization="1" - BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -201,13 +200,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;"..\..\tiff-3.8.2\libtiff"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" - RuntimeLibrary="2" + 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" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" WarningLevel="4" DebugInformationFormat="3" + CompileAs="1" DisableSpecificWarnings="4127" /> <Tool @@ -221,15 +223,13 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="1" + LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary="./Release\spandsp.lib" - TargetMachine="1" + ImportLibrary="$(TargetDir)spandsp.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -1155,12 +1155,30 @@ > </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}" + <File + RelativePath=".\msvc\spandsp.h" > - </Filter> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj Tue Feb 24 23:45:36 2009 @@ -346,12 +346,6 @@ > </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> 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 Tue Feb 24 23:45:36 2009 @@ -477,12 +477,6 @@ > </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> Modified: freeswitch/trunk/libs/spandsp/src/msvc/config.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/config.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/config.h Tue Feb 24 23:45:36 2009 @@ -37,12 +37,51 @@ #define SPANDSP_USE_EXPORT_CAPABILITY 1 -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} +#define PACKAGE "spandsp" +#define VERSION "0.0.6" + + + +// Win32/DevStudio compatibility stuff + +#ifdef _MSC_VER + + #if (_MSC_VER >= 1400) // VC8+ + #ifndef _CRT_SECURE_NO_DEPRECATE + #define _CRT_SECURE_NO_DEPRECATE + #endif + #ifndef _CRT_NONSTDC_NO_DEPRECATE + #define _CRT_NONSTDC_NO_DEPRECATE + #endif + #ifndef _CRT_SECURE_NO_WARNINGS + #define _CRT_SECURE_NO_WARNINGS + #endif + #endif // VC8+ + + // disable the following warnings + #pragma warning(disable:4100) // The formal parameter is not referenced in the body of the function. The unreferenced parameter is ignored. + #pragma warning(disable:4200) // Non standard extension C zero sized array + #pragma warning(disable:4706) // assignment within conditional expression + #pragma warning(disable:4244) // conversion from 'type1' to 'type2', possible loss of data + #pragma warning(disable:4295) // array is too small to include a terminating null character + #pragma warning(disable:4125) // decimal digit terminates octal escape sequence + #pragma warning(disable:4305) // 'function' : truncation from 'double' to 'float' + #pragma warning(disable:4018) // '<' : signed/unsigned mismatch + #pragma warning(disable:4389) // '==' : signed/unsigned mismatch + #pragma warning(disable:4245) // 'return' : conversion from 'int' to 'size_t', signed/unsigned mismatch + + #define strncasecmp _strnicmp + #define strcasecmp _stricmp + #define snprintf _snprintf + #define inline __inline + #define __inline__ __inline + + #define _MMX_H_ + + #include <malloc.h> // To get alloca + #endif + #endif Modified: freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h Tue Feb 24 23:45:36 2009 @@ -19,16 +19,7 @@ extern "C" { #endif -#ifdef _MSC_VER -#if (_MSC_VER >= 1400) // VC8+ -#ifndef _CRT_SECURE_NO_DEPRECATE -#define _CRT_SECURE_NO_DEPRECATE -#endif -#ifndef _CRT_NONSTDC_NO_DEPRECATE -#define _CRT_NONSTDC_NO_DEPRECATE -#endif -#endif // VC8+ -#include <windows.h> + typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; @@ -37,41 +28,12 @@ typedef __int16 int16_t; typedef __int32 int32_t; typedef __int64 int64_t; -#define inline __inline -#define __inline__ __inline #define INT16_MAX 0x7fff #define INT16_MIN (-INT16_MAX - 1) -#define _MMX_H_ - -/* disable the following warnings - * C4100: The formal parameter is not referenced in the body of the function. The unreferenced parameter is ignored. - * C4200: Non standard extension C zero sized array - * C4706: assignment within conditional expression - * C4244: conversion from 'type1' to 'type2', possible loss of data - * C4295: array is too small to include a terminating null character - * C4125: decimal digit terminates octal escape sequence - */ -#pragma warning(disable:4100 4200 4706 4295 4125) - -#pragma comment(lib, "ws2_32.lib") - -#ifndef strncasecmp -#define strncasecmp _strnicmp -#endif -#ifndef strcasecmp -#define strcasecmp _stricmp -#endif -#ifndef snprintf -#define snprintf _snprintf -#endif #if !defined(INFINITY) #define INFINITY 0x7fffffff #endif -#endif - -#define PACKAGE "spandsp" -#define VERSION "0.0.3andabit" #define INT32_MAX (2147483647) #define INT32_MIN (-2147483647 - 1) Modified: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h Tue Feb 24 23:45:36 2009 @@ -30,13 +30,17 @@ #if !defined(_SPANDSP_H_) #define _SPANDSP_H_ +#define __inline__ __inline +#pragma warning(disable:4200) + + #undef SPANDSP_USE_FIXED_POINT #undef SPANDSP_MISALIGNED_ACCESS_FAILS #define SPANDSP_USE_EXPORT_CAPABILITY 1 #include <stdlib.h> -#include <inttypes.h> +#include <msvc\inttypes.h> #include <string.h> #include <limits.h> #include <time.h> Modified: freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h Tue Feb 24 23:45:36 2009 @@ -1 +1,20 @@ +/* + * SpanDSP - a series of DSP components for telephony + * + * sys/time.h - a fudge for MSVC, which lacks this header + * + * Written by Steve Underwood <steveu(a)coppice.org> + * + * Copyright (C) 2006 Michael Jerris + * + * + * This file is released in the public domain. + * + */ + +struct timeval { + long tv_sec; + long tv_usec; +}; + extern void gettimeofday(struct timeval *tv, void *tz); Modified: freeswitch/trunk/libs/spandsp/src/msvc/unistd.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/unistd.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/unistd.h Tue Feb 24 23:45:36 2009 @@ -1,7 +1,7 @@ /* * SpanDSP - a series of DSP components for telephony * - * inttypes.h - a fudge for MSVC, which lacks this header + * unistd.h - a fudge for MSVC, which lacks this header * * Written by Steve Underwood <steveu(a)coppice.org> * @@ -19,8 +19,9 @@ extern "C" { #endif -#define open _open -#define write _write +// Declare this so we don't have to include winsock.h, it causes numerous conflicts. +extern int __stdcall gethostname(char * name, int namelen); +#pragma comment(lib, "ws2_32.lib") extern int getopt(int argc, char *argv[], char *opstring); Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot Tue Feb 24 23:45:36 2009 @@ -1,10 +1,28 @@ </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}" + <File + RelativePath=".\msvc\spandsp.h" > - </Filter> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Tue Feb 24 23:45:36 2009 @@ -1,10 +1,28 @@ </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}" + <File + RelativePath=".\msvc\spandsp.h" > - </Filter> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Copying $(InputPath) to $(SolutionDir)$(InputFileName)" + CommandLine="copy $(InputPath) $(SolutionDir)$(InputFileName)" + Outputs="$(SolutionDir)$(InputFileName)" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals>

1 0

[commit] r12271 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_sofia mod/event_handlers/mod_erlang_event mod/event_handlers/mod_event_socket mod/languages/mod_spidermonkey
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Tue Feb 24 21:41:18 2009 New Revision: 12271 Log: fix issue in monitor_early_media_fail issue Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_rwlock.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Feb 24 21:41:18 2009 @@ -78,7 +78,8 @@ #define switch_channel_ready(_channel) switch_channel_test_ready(_channel, SWITCH_FALSE) #define switch_channel_media_ready(_channel) switch_channel_test_ready(_channel, SWITCH_TRUE) - +#define switch_channel_up(_channel) (switch_channel_get_state(_channel) < CS_HANGUP) +#define switch_channel_down(_channel) (switch_channel_get_state(_channel) >= CS_HANGUP) SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state); SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Feb 24 21:41:18 2009 @@ -1532,7 +1532,7 @@ switch_channel_clear_flag(peer_channel, CF_INNER_BRIDGE); switch_channel_clear_flag(channel, CF_INNER_BRIDGE); - if (!switch_channel_get_state(peer_channel) >= CS_HANGUP) { + if (!switch_channel_down(peer_channel)) { switch_core_session_rwunlock(peer_session); goto end; } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Feb 24 21:41:18 2009 @@ -1091,7 +1091,7 @@ now = switch_micro_time_now(); elapsed = (unsigned int) ((now - started) / 1000); - if (switch_channel_get_state(channel) >= CS_HANGUP || switch_test_flag(tech_pvt, TFLAG_BYE)) { + if (switch_channel_down(channel) || switch_test_flag(tech_pvt, TFLAG_BYE)) { goto out; } @@ -1119,7 +1119,7 @@ switch_cond_next(); } - if (switch_channel_get_state(channel) >= CS_HANGUP || switch_test_flag(tech_pvt, TFLAG_BYE)) { + if (switch_channel_down(channel) || switch_test_flag(tech_pvt, TFLAG_BYE)) { goto out; } @@ -2542,7 +2542,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using Existing session for %s\n", ldl_session_get_id(dlsession)); - if (switch_channel_get_state(channel) >= CS_HANGUP) { + if (switch_channel_down(channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Call %s is already over\n", switch_channel_get_name(channel)); status = LDL_STATUS_FALSE; goto done; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Feb 24 21:41:18 2009 @@ -1081,7 +1081,7 @@ break; case IAX_EVENT_VOICE: if (tech_pvt && (tech_pvt->read_frame.datalen = iaxevent->datalen) != 0) { - if (channel && switch_channel_get_state(channel) <= CS_HANGUP) { + if (channel && switch_channel_up(channel)) { int bytes = 0, frames = 1; if (!switch_test_flag(tech_pvt, TFLAG_CODEC) || !tech_pvt->read_codec.implementation) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Feb 24 21:41:18 2009 @@ -959,7 +959,7 @@ private_object_t *tech_pvt = switch_core_session_get_private(session); switch_status_t status = SWITCH_STATUS_SUCCESS; - if (switch_channel_get_state(channel) >= CS_HANGUP || !tech_pvt) { + if (switch_channel_down(channel) || !tech_pvt) { status = SWITCH_STATUS_FALSE; goto end; } @@ -997,7 +997,7 @@ /* ones that do need to lock sofia mutex */ switch_mutex_lock(tech_pvt->sofia_mutex); - if (switch_channel_get_state(channel) >= CS_HANGUP || !tech_pvt) { + if (switch_channel_down(channel) || !tech_pvt) { status = SWITCH_STATUS_FALSE; goto end_lock; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Feb 24 21:41:18 2009 @@ -364,7 +364,7 @@ } if (session) { - if (channel && switch_channel_get_state(channel) >= CS_HANGUP) { + if (channel && switch_channel_down(channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n"); goto done; } @@ -3325,7 +3325,7 @@ status = switch_ivr_originate(a_session, &tsession, &cause, nhelper->exten, timeout, NULL, NULL, NULL, NULL, NULL, SOF_NONE); - if ((switch_channel_get_state(channel_a) < CS_HANGUP)) { + if ((switch_channel_up(channel_a))) { if (status != SWITCH_STATUS_SUCCESS || cause != SWITCH_CAUSE_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", nhelper->exten); Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Tue Feb 24 21:41:18 2009 @@ -1234,7 +1234,7 @@ switch_ivr_park(session, NULL); /* keep app thread running for lifetime of session */ - if (switch_channel_get_state(switch_core_session_get_channel(session)) >= CS_HANGUP) { + if (switch_channel_down(switch_core_session_get_channel(session))) { while (switch_test_flag(session_element, LFLAG_SESSION_ALIVE)) { switch_yield(100000); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Feb 24 21:41:18 2009 @@ -430,7 +430,7 @@ listener_run(NULL, (void *) listener); } - if (switch_channel_get_state(channel) >= CS_HANGUP) { + if (switch_channel_down(channel)) { while (switch_test_flag(listener, LFLAG_SESSION)) { switch_yield(100000); } @@ -1192,7 +1192,7 @@ } } - if (channel && switch_channel_get_state(channel) >= CS_HANGUP && !switch_test_flag(listener, LFLAG_HANDLE_DISCO)) { + if (channel && switch_channel_down(channel) && !switch_test_flag(listener, LFLAG_HANDLE_DISCO)) { switch_set_flag_locked(listener, LFLAG_HANDLE_DISCO); if (switch_test_flag(listener, LFLAG_LINGER)) { char message[128] = ""; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Feb 24 21:41:18 2009 @@ -2152,7 +2152,7 @@ saveDepth = JS_SuspendRequest(cx); for (;;) { if (((elapsed = (unsigned int) ((switch_micro_time_now() - started) / 1000)) > (switch_time_t) timeout) - || switch_channel_get_state(channel) >= CS_HANGUP) { + || switch_channel_down(channel)) { *rval = BOOLEAN_TO_JSVAL(JS_FALSE); break; } @@ -2200,7 +2200,7 @@ saveDepth = JS_SuspendRequest(cx); for (;;) { if (((elapsed = (unsigned int) ((switch_micro_time_now() - started) / 1000)) > (switch_time_t) timeout) - || switch_channel_get_state(channel) >= CS_HANGUP) { + || switch_channel_down(channel)) { *rval = BOOLEAN_TO_JSVAL(JS_FALSE); break; } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Feb 24 21:41:18 2009 @@ -1590,7 +1590,6 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n", channel->name, state_names[last_state], switch_channel_cause2str(channel->hangup_cause)); - switch_core_media_bug_remove_all(channel->session); switch_channel_set_variable(channel, "hangup_cause", switch_channel_cause2str(channel->hangup_cause)); switch_channel_presence(channel, "unavailable", switch_channel_cause2str(channel->hangup_cause), NULL); Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Feb 24 21:41:18 2009 @@ -41,7 +41,7 @@ switch_io_event_hook_video_write_frame_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -65,7 +65,7 @@ switch_assert(session != NULL); - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -123,7 +123,7 @@ top: - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { *frame = NULL; status = SWITCH_STATUS_FALSE; goto even_more_done; } @@ -1066,7 +1066,7 @@ switch_status_t status; switch_dtmf_t new_dtmf; - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -1096,7 +1096,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_dtmf_t new_dtmf; - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -1144,7 +1144,7 @@ switch_assert(session != NULL); - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_core_rwlock.c ============================================================================== --- freeswitch/trunk/src/switch_core_rwlock.c (original) +++ freeswitch/trunk/src/switch_core_rwlock.c Tue Feb 24 21:41:18 2009 @@ -45,7 +45,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (session->rwlock) { - if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_down(session->channel)) { status = SWITCH_STATUS_FALSE; #ifdef SWITCH_DEBUG_RWLOCKS switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock FAIL\n", Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Feb 24 21:41:18 2009 @@ -91,7 +91,7 @@ const char *this_val; session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - if (switch_channel_get_state(session->channel) < CS_HANGUP && + if (switch_channel_up(session->channel) && (this_val = switch_channel_get_variable(session->channel, var_name)) && (!strcmp(this_val, var_val))) { switch_channel_hangup(session->channel, cause); } @@ -163,7 +163,7 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str)) != 0) { /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - if (switch_channel_get_state(session->channel) < CS_HANGUP) { + if (switch_channel_up(session->channel)) { status = switch_core_session_receive_message(session, message); } switch_core_session_rwunlock(session); @@ -183,7 +183,7 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str)) != 0) { /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - if (switch_channel_get_state(session->channel) < CS_HANGUP) { + if (switch_channel_up(session->channel)) { status = switch_core_session_queue_event(session, event); } switch_core_session_rwunlock(session); @@ -470,7 +470,7 @@ switch_assert(session != NULL); - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -626,7 +626,7 @@ /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - if (switch_channel_get_state(session->channel) < CS_HANGUP) { + if (switch_channel_up(session->channel)) { if (session->endpoint_interface->io_routines->receive_event) { status = session->endpoint_interface->io_routines->receive_event(session, *event); } @@ -1247,7 +1247,7 @@ { switch_application_interface_t *application_interface; - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (switch_channel_down(session->channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is hungup, aborting execution of application: %s\n", app); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Tue Feb 24 21:41:18 2009 @@ -390,7 +390,6 @@ break; case CS_DONE: goto done; - /* HANGUP INIT ROUTING and RESET are all short term so we signal lock during their callbacks */ case CS_HANGUP: /* Deactivate and end the thread */ { const char *var = switch_channel_get_variable(session->channel, SWITCH_PROCESS_CDR_VARIABLE); @@ -410,10 +409,10 @@ do_extra_handlers = 0; } } + + switch_core_media_bug_remove_all(session); STATE_MACRO(hangup, "HANGUP"); - - switch_core_media_bug_remove_all(session); hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE); if (switch_true(switch_channel_get_variable(session->channel, SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE))) { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Feb 24 21:41:18 2009 @@ -1774,13 +1774,14 @@ sth->ready = 1; - while (switch_channel_ready(channel) && !switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) { + while (switch_channel_up(channel) && !switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) { char *xmlstr = NULL; switch_thread_cond_wait(sth->cond, sth->mutex); - if (switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) + if (switch_channel_down(channel) || switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) { break; + } if (switch_core_asr_check_results(sth->ah, &flags) == SWITCH_STATUS_SUCCESS) { switch_event_t *event; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Feb 24 21:41:18 2009 @@ -206,7 +206,7 @@ goto end_of_bridge_loop; } - if ((b_state = switch_channel_get_state(chan_b)) >= CS_HANGUP) { + if ((b_state = switch_channel_down(chan_b))) { goto end_of_bridge_loop; } @@ -398,7 +398,7 @@ } - if (switch_channel_get_state(chan_b) >= CS_HANGUP) { + if (switch_channel_down(chan_b)) { if (originator && switch_channel_ready(chan_a) && !switch_channel_test_flag(chan_a, CF_ANSWERED)) { switch_channel_hangup(chan_a, switch_channel_get_cause(chan_b)); } @@ -409,7 +409,7 @@ msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); - if (!inner_bridge && switch_channel_get_state(chan_a) < CS_HANGUP) { + if (!inner_bridge && switch_channel_up(chan_a)) { if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) { switch_caller_extension_t *extension = NULL; if ((extension = switch_caller_extension_new(session_a, app_name, app_name)) == 0) { @@ -693,7 +693,7 @@ switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - if (switch_channel_get_state(other_channel) < CS_HANGUP) { + if (switch_channel_up(other_channel)) { switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); } } @@ -723,7 +723,7 @@ switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); switch_event_t *event; - if (switch_channel_get_state(peer_channel) >= CS_HANGUP) { + if (switch_channel_down(peer_channel)) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); return SWITCH_STATUS_FALSE; } @@ -1013,7 +1013,7 @@ originator_channel = switch_core_session_get_channel(originator_session); originatee_channel = switch_core_session_get_channel(originatee_session); - if (switch_channel_get_state(originator_channel) >= CS_HANGUP) { + if (switch_channel_down(originator_channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s is hungup refusing to bridge.\n", switch_channel_get_name(originatee_channel)); switch_core_session_rwunlock(originator_session); switch_core_session_rwunlock(originatee_session); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Feb 24 21:41:18 2009 @@ -171,7 +171,7 @@ switch_core_session_exec(collect->session, application_interface, app_data); - if (switch_channel_get_state(channel) < CS_HANGUP) { + if (switch_channel_up(channel)) { switch_channel_set_flag(channel, CF_WINNER); } goto wbreak; @@ -228,7 +228,7 @@ time_t elapsed = switch_epoch_time_now(NULL) - start; for (i = 0; i < max; i++) { - if (originate_status[i].peer_channel && switch_channel_get_state(originate_status[i].peer_channel) < CS_HANGUP) { + if (originate_status[i].peer_channel && switch_channel_up(originate_status[i].peer_channel)) { if (originate_status[i].per_channel_progress_timelimit_sec && elapsed > originate_status[i].per_channel_progress_timelimit_sec && !( switch_channel_test_flag(originate_status[i].peer_channel, CF_RING_READY) || @@ -1719,7 +1719,7 @@ } pchannel = switch_core_session_get_channel(originate_status[i].peer_session); - if (switch_channel_get_state(pchannel) >= CS_HANGUP) { + if (switch_channel_down(pchannel)) { cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel)); if (switch_stristr(cause_str, fail_on_single_reject_var)) { ok = 0;

1 0

[commit] r12270 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Tue Feb 24 20:22:07 2009 New Revision: 12270 Log: FSCORE-309 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 24 20:22:07 2009 @@ -1554,9 +1554,7 @@ if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if (clone) { char *x; - switch_mutex_lock(XML_GEN_LOCK); x = switch_xml_toxml(tag, SWITCH_FALSE); - switch_mutex_unlock(XML_GEN_LOCK); switch_assert(x); *root = switch_xml_parse_str(x, strlen(x)); *node = *root; @@ -2112,9 +2110,12 @@ SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml, switch_bool_t prn_header) { - char *s; + char *r, *s; + switch_mutex_lock(XML_GEN_LOCK); s = (char *)malloc(SWITCH_XML_BUFSIZE); - return switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header); + r = switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header); + switch_mutex_unlock(XML_GEN_LOCK); + return r; } // converts an switch_xml structure back to xml, returning a string of xml date that

1 0

[commit] r12269 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Tue Feb 24 18:56:17 2009 New Revision: 12269 Log: FSCORE-309 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 24 18:56:17 2009 @@ -142,6 +142,7 @@ static switch_thread_rwlock_t *RWLOCK = NULL; static switch_thread_rwlock_t *B_RWLOCK = NULL; static switch_mutex_t *XML_LOCK = NULL; +static switch_mutex_t *XML_GEN_LOCK = NULL; struct xml_section_t { @@ -1553,12 +1554,12 @@ if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if (clone) { char *x; - switch_mutex_lock(XML_LOCK); + switch_mutex_lock(XML_GEN_LOCK); x = switch_xml_toxml(tag, SWITCH_FALSE); + switch_mutex_unlock(XML_GEN_LOCK); switch_assert(x); *root = switch_xml_parse_str(x, strlen(x)); *node = *root; - switch_mutex_unlock(XML_LOCK); switch_xml_free(xml); } else { *node = tag; @@ -1904,6 +1905,7 @@ *err = "Success"; switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); + switch_mutex_init(&XML_GEN_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL); switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL);

1 0

[commit] r12268 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: anthm Date: Tue Feb 24 18:46:51 2009 New Revision: 12268 Log: FSCORE-309 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 24 18:46:51 2009 @@ -1552,10 +1552,13 @@ if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if (clone) { - char *x = switch_xml_toxml(tag, SWITCH_FALSE); + char *x; + switch_mutex_lock(XML_LOCK); + x = switch_xml_toxml(tag, SWITCH_FALSE); switch_assert(x); *root = switch_xml_parse_str(x, strlen(x)); *node = *root; + switch_mutex_unlock(XML_LOCK); switch_xml_free(xml); } else { *node = tag;

1 0

[commit] r12267 - freeswitch/trunk/src
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: anthm Date: Tue Feb 24 17:30:17 2009 New Revision: 12267 Log: IRC-000 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 24 17:30:17 2009 @@ -1778,6 +1778,12 @@ switch_event_destroy(&my_params); } + if (status != SWITCH_STATUS_SUCCESS && root && *root) { + switch_xml_free(*root); + *root = NULL; + *domain = NULL; + } + return status; }

1 0

[commit] r12266 - freeswitch/trunk/support-d
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: mrene Date: Tue Feb 24 16:07:38 2009 New Revision: 12266 Log: gdb update Modified: freeswitch/trunk/support-d/.gdbinit Modified: freeswitch/trunk/support-d/.gdbinit ============================================================================== --- freeswitch/trunk/support-d/.gdbinit (original) +++ freeswitch/trunk/support-d/.gdbinit Tue Feb 24 16:07:38 2009 @@ -11,7 +11,9 @@ end printf "Found %d sessions.\n", $i end -document list_sessions Print a list of session uuid and pointers +document list_sessions +Print a list of session uuid and pointers +end define hash_it_str dont-repeat @@ -23,7 +25,10 @@ set $i = $i + 1 end end -document hash_it_str Prints the content of a hashtable displaying the key as a string and the value as pointer +document hash_it_str +Usage: hash_it_str [hashtable] +Prints the content of a hashtable displaying the key as a string and the value as pointer +end define hash_it_int dont-repeat @@ -35,7 +40,10 @@ set $i = $i + 1 end end -document hash_it_int Prints the content of a hashtable displaying the key as an int and the value as pointer +document hash_it_int +Usage: hash_it_int [hashtable] +Prints the content of a hashtable displaying the key as an int and the value as pointer +end define hash_it_str_x dont-repeat @@ -43,13 +51,16 @@ set $x=$arg0->table->first while($x != 0x0) printf "key: %s\n", $x->pKey - print (($arg1)$x->data)->$arg2 + print (($arg1*)$x->data)->$arg2 printf "\n\n" set $x = $x->next set $i = $i + 1 end end -document hash_it_str_x Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member +document hash_it_str_x +Usage: hash_it_str_x [hashtable] [value_type] [member] +Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member +end define hash_it_int_x dont-repeat @@ -57,10 +68,13 @@ set $x=$arg0->table->first while($x != 0x0) printf "key: %d\n", $x->pKey - print (($arg1)$x->data)->$arg2 + print (($arg1*)$x->data)->$arg2 printf "\n\n" set $x = $x->next set $i = $i + 1 end end -document hash_it_int_x Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member +document hash_it_int_x +Usage: hash_it_int_x [hashtable] [value_type] [member] +Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. +end

1 0

[commit] r12265 - freeswitch/trunk/support-d
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: mrene Date: Tue Feb 24 16:01:10 2009 New Revision: 12265 Log: GDB goodies Modified: freeswitch/trunk/support-d/.gdbinit Modified: freeswitch/trunk/support-d/.gdbinit ============================================================================== --- freeswitch/trunk/support-d/.gdbinit (original) +++ freeswitch/trunk/support-d/.gdbinit Tue Feb 24 16:01:10 2009 @@ -1,5 +1,6 @@ # FreeSWITCH Custom GDB commands define list_sessions + dont-repeat printf "Listing sessions: \n" set $i = 0 set $x=session_manager.session_table->table->first @@ -9,4 +10,57 @@ set $i = $i + 1 end printf "Found %d sessions.\n", $i -end \ No newline at end of file +end +document list_sessions Print a list of session uuid and pointers + +define hash_it_str + dont-repeat + set $i = 0 + set $x=$arg0->table->first + while($x != 0x0) + printf "key: %s valueptr: %p\n", $x->pKey, $x->data + set $x = $x->next + set $i = $i + 1 + end +end +document hash_it_str Prints the content of a hashtable displaying the key as a string and the value as pointer + +define hash_it_int + dont-repeat + set $i = 0 + set $x=$arg0->table->first + while($x != 0x0) + printf "key: %d valueptr: %p\n", $x->pKey, $x->data + set $x = $x->next + set $i = $i + 1 + end +end +document hash_it_int Prints the content of a hashtable displaying the key as an int and the value as pointer + +define hash_it_str_x + dont-repeat + set $i = 0 + set $x=$arg0->table->first + while($x != 0x0) + printf "key: %s\n", $x->pKey + print (($arg1)$x->data)->$arg2 + printf "\n\n" + set $x = $x->next + set $i = $i + 1 + end +end +document hash_it_str_x Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member + +define hash_it_int_x + dont-repeat + set $i = 0 + set $x=$arg0->table->first + while($x != 0x0) + printf "key: %d\n", $x->pKey + print (($arg1)$x->data)->$arg2 + printf "\n\n" + set $x = $x->next + set $i = $i + 1 + end +end +document hash_it_int_x Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member

1 0

[commit] r12264 - freeswitch/trunk/src
by FreeSWITCH SVN 24 Feb '09

24 Feb '09

Author: anthm Date: Tue Feb 24 13:58:45 2009 New Revision: 12264 Log: double doh Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 24 13:58:45 2009 @@ -1547,12 +1547,14 @@ SWITCH_DECLARE(void *) switch_ivr_digit_stream_parser_feed(switch_ivr_digit_stream_parser_t *parser, switch_ivr_digit_stream_t *stream, char digit) { void *result = NULL; - switch_size_t len = strlen(stream->digits); + switch_size_t len; switch_assert(parser); switch_assert(stream); switch_assert(stream->digits); + len = strlen(stream->digits); + /* handle new digit arrivals */ if (digit) { /* if it's not a terminator digit, add it to the collected digits */

1 0