[Iaxclient-cvs] SF.net SVN: iaxclient: [1297] branches/team/elbunce/iaxclient

[<do...@us...>]

Revision: 1297
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1297&view=rev
Author:   dohpaz
Date:     2007-12-03 21:15:51 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
Merge up to trunk of r1296.

Modified Paths:
--------------
    branches/team/elbunce/iaxclient/contrib/win/vs2005/libiaxclient.vcproj
    branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
    branches/team/elbunce/iaxclient/lib/video.c

Removed Paths:
-------------
    branches/team/elbunce/iaxclient/simpleclient/stresstest/stresstest.vcproj

Property Changed:
----------------
    branches/team/elbunce/iaxclient/contrib/win/vs2005/testcall.vcproj
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/QUICKSTART
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/iaxcomm.htb
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP0.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP1.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP2.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP3.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP4.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP5.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP6.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP7.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP8.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP9.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KPPOUND.bmp
    branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KPSTAR.bmp

Modified: branches/team/elbunce/iaxclient/contrib/win/vs2005/libiaxclient.vcproj
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vs2005/libiaxclient.vcproj	2007-12-03 16:27:40 UTC (rev 1296)
+++ branches/team/elbunce/iaxclient/contrib/win/vs2005/libiaxclient.vcproj	2007-12-04 05:15:51 UTC (rev 1297)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common;..\..\..\..\libvidcap\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;SPEEX_EC=1;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;SPEEX_EC=1;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"
@@ -104,7 +104,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common;..\..\..\..\libvidcap\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;SPEEX_EC=1;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;SPEEX_EC=1;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common;..\..\..\..\libvidcap\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;SPEEX_EC=1;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;SPEEX_EC=1;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -239,7 +239,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common;..\..\..\..\libvidcap\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;SPEEX_EC=1;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;SPEEX_EC=1;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;USE_VIDEO;USE_THEORA;CODEC_GSM"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"


Property changes on: branches/team/elbunce/iaxclient/contrib/win/vs2005/testcall.vcproj
___________________________________________________________________
Name: svn:executable
   - *

Modified: branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c	2007-12-03 16:27:40 UTC (rev 1296)
+++ branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c	2007-12-04 05:15:51 UTC (rev 1297)
@@ -488,6 +488,10 @@
 		s->sendto = iax_sendto;
 		s->pingid = -1;
 
+#ifdef USE_VOICE_TS_PREDICTION
+		s->nextpred = 0;
+#endif
+
 		s->jb = jb_new();
 		if ( !s->jb )
 		{
@@ -546,13 +550,14 @@
 static void add_ms(struct timeval *tv, int ms)
 {
 	tv->tv_usec += ms * 1000;
-	if(tv->tv_usec > 1000000) {
-		tv->tv_usec -= 1000000;
-		tv->tv_sec++;
+	if (tv->tv_usec > 999999) {
+		tv->tv_sec += tv->tv_usec / 1000000;
+		tv->tv_usec %= 1000000;
 	}
-	if(tv->tv_usec < 0) {
-		tv->tv_usec += 1000000;
-		tv->tv_sec--;
+
+	if (tv->tv_usec < 0) {
+		tv->tv_sec += (tv->tv_usec / 1000000 - 1);
+		tv->tv_usec = (tv->tv_usec % 1000000) + 1000000;
 	}
 }
 #endif
@@ -653,7 +658,7 @@
 #ifdef USE_VOICE_TS_PREDICTION
 	/* set next predicted ts based on 8khz samples */
 	if(voice)
-	    session->nextpred = session->nextpred + f->samples / 8;
+	    session->nextpred += f->samples / 8;
 #endif
 
 	return ms;

Modified: branches/team/elbunce/iaxclient/lib/video.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/video.c	2007-12-03 16:27:40 UTC (rev 1296)
+++ branches/team/elbunce/iaxclient/lib/video.c	2007-12-04 05:15:51 UTC (rev 1297)
@@ -563,7 +563,7 @@
 		 * vidcap_src_release() fails during capture.
 		 *
 		 * We'll defer the release until the end-application's main thread
-		 * requires the release - if either iaxc_set_video_prefs(), 
+		 * requires the release - if either iaxc_set_video_prefs(),
 		 * iaxc_video_device_set() or video_destroy() are called.
 		 */
 
@@ -572,6 +572,12 @@
 		return -1;
 	}
 
+	if ( cap_info->video_data_size < 1 )
+	{
+		fprintf(stderr, "FYI: callback with no data\n");
+		return 0;
+	}
+
 	if ( vinfo.prefs & IAXC_VIDEO_PREF_CAPTURE_DISABLE )
 		return 0;
 
@@ -1019,7 +1025,7 @@
 						capture_callback, 0)) )
 			{
 				MUTEXUNLOCK(&vinfo.camera_lock);
-				fprintf(stderr, "failed to start video capture: %d\n", 
+				fprintf(stderr, "failed to start video capture: %d\n",
 						ret);
 				return -1;
 			}
@@ -1322,8 +1328,8 @@
 }
 
 EXPORT int iaxc_video_devices_get(struct iaxc_video_device **devs,
-			int *num_devs, int *id_selected) 
-{ 
+			int *num_devs, int *id_selected)
+{
 	int new_device_count;
 	int old_device_count;
 	struct vidcap_src_info *new_src_list;
@@ -1331,13 +1337,15 @@
 	struct iaxc_video_device  *new_iaxc_dev_list;
 	struct iaxc_video_device  *old_iaxc_dev_list;
 	int found_selected_device = 0;
-	int list_changed = 0;
+	int list_changed;
 	int i, n;
 
+	if ( !vinfo.sapi )
+		return -1;
+
 	/* update libvidcap's device list */
 	new_device_count = vidcap_src_list_update(vinfo.sapi);
-	if ( new_device_count != vinfo.device_count )
-		list_changed = 1;
+	list_changed = new_device_count != vinfo.device_count;
 
 	if ( new_device_count < 0 )
 	{
@@ -1346,16 +1354,17 @@
 		return -1;
 	}
 
-	new_src_list = (struct vidcap_src_info *)malloc(new_device_count *
-			sizeof(struct vidcap_src_info));
+	new_src_list = calloc(new_device_count, sizeof(struct vidcap_src_info));
+
 	if ( !new_src_list )
 	{
 		fprintf(stderr, "ERROR: failed updated source allocation\n");
 		return -1;
 	}
 
-	new_iaxc_dev_list = (struct iaxc_video_device  *)malloc(
-			new_device_count * sizeof(struct iaxc_video_device));
+	new_iaxc_dev_list = calloc(new_device_count,
+			sizeof(struct iaxc_video_device));
+
 	if ( !new_iaxc_dev_list )
 	{
 		free(new_src_list);
@@ -1366,7 +1375,7 @@
 	/* get an updated libvidcap device list */
 	if ( vidcap_src_list_get(vinfo.sapi, new_device_count, new_src_list) )
 	{
-		fprintf(stderr, "ERROR: failed vidcap_srcList_get()\n");
+		fprintf(stderr, "ERROR: failed vidcap_srcList_get().\n");
 
 		free(new_src_list);
 		free(new_iaxc_dev_list);
@@ -1374,7 +1383,6 @@
 	}
 
 	/* build a new iaxclient video source list */
-	found_selected_device = 0;
 	for ( n = 0; n < new_device_count; n++ )
 	{
 		new_iaxc_dev_list[n].name = strdup(new_src_list[n].description);
@@ -1454,11 +1462,11 @@
 	*num_devs = vinfo.device_count;
 	*id_selected = vinfo.selected_device_id;
 
-	return list_changed; 
-} 
+	return list_changed;
+}
 
-EXPORT int iaxc_video_device_set(int capture_dev_id) 
-{ 
+EXPORT int iaxc_video_device_set(int capture_dev_id)
+{
 	int ret = 0;
 	int dev_num = 0;
 
@@ -1584,16 +1592,18 @@
 		goto bail;
 	}
 
-	vinfo.vc_src_info = (struct vidcap_src_info *)malloc(vinfo.device_count *
+	vinfo.vc_src_info = calloc(vinfo.device_count,
 			sizeof(struct vidcap_src_info));
+
 	if ( !vinfo.vc_src_info )
 	{
 		fprintf(stderr, "ERROR: failed vinfo field allocations\n");
 		goto bail;
 	}
 
-	vinfo.devices = (struct iaxc_video_device *)malloc(vinfo.device_count *
+	vinfo.devices = calloc(vinfo.device_count,
 			sizeof(struct iaxc_video_device));
+
 	if ( !vinfo.devices )
 	{
 		fprintf(stderr, "ERROR: failed vinfo field allocation\n");
@@ -1637,7 +1647,7 @@
 		fprintf(stderr, "ERROR: failed vidcap_srcs_notify()\n");
 		goto late_bail;
 	}
-	
+
 	vinfo.prefs =
 		IAXC_VIDEO_PREF_RECV_LOCAL_RAW |
 		IAXC_VIDEO_PREF_RECV_REMOTE_RAW |
@@ -1657,6 +1667,11 @@
 	free(vinfo.devices);
 
 bail:
+	if ( vinfo.sapi )
+	{
+		vidcap_sapi_release(vinfo.sapi);
+		vinfo.sapi = 0;
+	}
 	vidcap_destroy(vinfo.vc);
 	vinfo.vc = 0;
 	return -1;
@@ -1682,7 +1697,7 @@
 
 	if ( vinfo.src )
 		vidcap_src_release(vinfo.src);
-	
+
 	vidcap_destroy(vinfo.vc);
 	vinfo.vc = 0;
 
@@ -1723,7 +1738,7 @@
 	 * we are saying that the "camera is working" if there exists
 	 * more than zero cameras.
 	 */
-	return vidcap_src_list_update(vinfo.sapi) > 0;
+	return vinfo.sapi && vidcap_src_list_update(vinfo.sapi) > 0;
 }
 
 int video_send_stats(struct iaxc_call * call)
@@ -1757,27 +1772,27 @@
 EXPORT int iaxc_push_video(void *data, unsigned int size, int fragment)
 {
 	struct iaxc_call *call;
-	
+
 	if (selected_call < 0)
 		return -1;
-	
+
 	call = &calls[selected_call];
 
 	if ( vinfo.prefs & IAXC_VIDEO_PREF_SEND_DISABLE )
 		return 0;
-	
+
 	//fprintf(stderr, "iaxc_push_video: sending video size %d\n", size);
-	
+
 	// Fragment if needed
 	if ( fragment )
 	{
 		static struct slice_set_t slice_set;
 		int i;
-		
+
 		if ( !vinfo.sc )
 			vinfo.sc = create_slicer_context((unsigned short)rand(),
 					vfinfo.fragsize);
-		
+
 		slice(data, size, &slice_set, vinfo.sc);
 		for ( i = 0 ; i < slice_set.num_slices ; i++ )
 		{


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/QUICKSTART
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/iaxcomm.htb
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP0.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP1.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP2.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP3.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP4.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP5.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP6.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP7.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP8.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KP9.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KPPOUND.bmp
___________________________________________________________________
Name: svn:executable
   - *


Property changes on: branches/team/elbunce/iaxclient/simpleclient/iaxcomm/rc/bitmaps/KPSTAR.bmp
___________________________________________________________________
Name: svn:executable
   - *

Deleted: branches/team/elbunce/iaxclient/simpleclient/stresstest/stresstest.vcproj
===================================================================
--- branches/team/elbunce/iaxclient/simpleclient/stresstest/stresstest.vcproj	2007-12-03 16:27:40 UTC (rev 1296)
+++ branches/team/elbunce/iaxclient/simpleclient/stresstest/stresstest.vcproj	2007-12-04 05:15:51 UTC (rev 1297)
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="vtestcall"
-	ProjectGUID="{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}"
-	RootNamespace="vtestcall"
-	Keyword="ManagedCProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;&quot;.. \..\lib\portaudio\pablio&quot;;..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;SPEEX_PREPROCESS=1;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="false"
-				AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCD.lib "
-				AdditionalDependencies="dsound.lib iaxclient.lib libtheora.lib libogg.lib SDL.lib wsock32.lib winmm.lib videolib.lib libiax2.lib gsm.lib portaudio.lib libspeex.lib strmiids.lib portmixerd.lib"
-				ShowProgress="0"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;..\..\lib\Debug;&quot;$(SDL_DIR)\lib&quot;;&quot;$(PSDK_DIR)\lib&quot;;..\..\lib\portmixer\winproj"
-				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="true"
-				AssemblyDebug="0"
-				SubSystem="1"
-				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
-			Name="Release|Win32"
-			OutputDirectory="release"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			ManagedExtensions="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;&quot;.. \..\lib\portaudio\pablio&quot;;..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;SPEEX_PREPROCESS=1;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="dsound.lib iaxclient.lib libtheora.lib libogg.lib SDL.lib wsock32.lib winmm.lib videolib.lib libiax2.lib gsm.lib portaudio.lib libspeex.lib strmiids.lib portmixer.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(DXSDK_DIR)\lib\x86&quot;;..\..\lib\Release;&quot;$(SDL_DIR)\lib&quot;;&quot;$(PSDK_DIR)\lib&quot;;..\..\lib\portmixer\winproj"
-				IgnoreDefaultLibraryNames="msvcrtd.lib;msvcrt.lib;libcmtd.lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				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>
-		<AssemblyReference
-			RelativePath="mscorlib.dll"
-			AssemblyName="mscorlib, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=IA64"
-		/>
-		<AssemblyReference
-			RelativePath="System.dll"
-			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-		/>
-		<AssemblyReference
-			RelativePath="System.Data.dll"
-			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
-		/>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\vtestcall.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.