Menu
▾
▴
iaxclient-cvs — Subversion commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(68) |
Jul
(27) |
Aug
(1) |
Sep
(9) |
Oct
(16) |
Nov
(64) |
Dec
(18) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(11) |
Feb
(5) |
Mar
(20) |
Apr
(9) |
May
(8) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
(11) |
Oct
(34) |
Nov
(23) |
Dec
(34) |
| 2005 |
Jan
(41) |
Feb
(25) |
Mar
(25) |
Apr
(32) |
May
(27) |
Jun
(9) |
Jul
(36) |
Aug
(6) |
Sep
(3) |
Oct
(11) |
Nov
(2) |
Dec
(21) |
| 2006 |
Jan
(14) |
Feb
(8) |
Mar
(18) |
Apr
(6) |
May
|
Jun
(17) |
Jul
(14) |
Aug
(26) |
Sep
(34) |
Oct
(24) |
Nov
(48) |
Dec
(64) |
| 2007 |
Jan
(72) |
Feb
(21) |
Mar
(50) |
Apr
(41) |
May
(35) |
Jun
(50) |
Jul
(33) |
Aug
(32) |
Sep
(50) |
Oct
(85) |
Nov
(43) |
Dec
(33) |
| 2008 |
Jan
(10) |
Feb
(29) |
Mar
(15) |
Apr
(45) |
May
(5) |
Jun
(2) |
Jul
(14) |
Aug
(3) |
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(9) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jpg...@us...> - 2007-11-28 20:17:36
|
Revision: 1291
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1291&view=rev
Author: jpgrayson
Date: 2007-11-28 12:17:42 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Remove svn:executable property from non-executable files.
Property Changed:
----------------
trunk/contrib/win/vs2005/testcall.vcproj
trunk/simpleclient/iaxcomm/QUICKSTART
trunk/simpleclient/iaxcomm/iaxcomm.htb
trunk/simpleclient/iaxcomm/rc/bitmaps/KP0.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP1.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP2.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP3.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP4.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP5.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP6.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP7.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP8.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KP9.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KPPOUND.bmp
trunk/simpleclient/iaxcomm/rc/bitmaps/KPSTAR.bmp
Property changes on: trunk/contrib/win/vs2005/testcall.vcproj
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/QUICKSTART
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/iaxcomm.htb
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP0.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP1.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP2.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP3.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP4.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP5.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP6.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP7.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP8.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KP9.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KPPOUND.bmp
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/simpleclient/iaxcomm/rc/bitmaps/KPSTAR.bmp
___________________________________________________________________
Name: svn:executable
- *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2007-11-28 20:17:07
|
Revision: 1290
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1290&view=rev
Author: jpgrayson
Date: 2007-11-28 12:17:11 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Define CODEC_GSM to enable gsm codec support.
Modified Paths:
--------------
trunk/contrib/win/vs2005/libiaxclient.vcproj
Modified: trunk/contrib/win/vs2005/libiaxclient.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libiaxclient.vcproj 2007-11-28 20:03:04 UTC (rev 1289)
+++ trunk/contrib/win/vs2005/libiaxclient.vcproj 2007-11-28 20:17:11 UTC (rev 1290)
@@ -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"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2007-11-28 20:03:01
|
Revision: 1289
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1289&view=rev
Author: jpgrayson
Date: 2007-11-28 12:03:04 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Define CODEC_GSM in libiaxclient.vcproj to enable gsm codec support in iaxclient.
Modified Paths:
--------------
branches/2.0/contrib/win/vs2005/libiaxclient.vcproj
Modified: branches/2.0/contrib/win/vs2005/libiaxclient.vcproj
===================================================================
--- branches/2.0/contrib/win/vs2005/libiaxclient.vcproj 2007-11-28 18:26:29 UTC (rev 1288)
+++ branches/2.0/contrib/win/vs2005/libiaxclient.vcproj 2007-11-28 20:03:04 UTC (rev 1289)
@@ -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"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;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"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;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"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;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"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <do...@us...> - 2007-11-28 18:26:25
|
Revision: 1288
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1288&view=rev
Author: dohpaz
Date: 2007-11-28 10:26:29 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Better diagnostic for transfer.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
Modified: branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c 2007-11-28 05:30:17 UTC (rev 1287)
+++ branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c 2007-11-28 18:26:29 UTC (rev 1288)
@@ -1424,6 +1424,8 @@
s1->transferpeer = s0->callno;
DEBU(G "iax_setup_transfer(%d, %d) transfer_id=%d\n", s0->callno, s1->callno, transfer_id);
+ DEBU(G "\torg: callno=%d peercallno=%d peeraddr=%s\n", s0->callno, s0->peercallno, inet_ntoa(s0->peeraddr.sin_addr));
+ DEBU(G "\tnew: callno=%d peercallno=%d peeraddr=%s\n", s1->callno, s1->peercallno, inet_ntoa(s1->peeraddr.sin_addr));
res = send_command(s0, AST_FRAME_IAX, IAX_COMMAND_TXREQ, 0, ied0.buf, ied0.pos, -1);
if (res < 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <do...@us...> - 2007-11-28 05:30:12
|
Revision: 1287
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1287&view=rev
Author: dohpaz
Date: 2007-11-27 21:30:17 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
Merge up to trunk of r1286.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/lib/iaxclient_lib.c
branches/team/elbunce/iaxclient/lib/iaxclient_lib.h
branches/team/elbunce/iaxclient/lib/portmixer/px_win_wmme/px_win_wmme.c
branches/team/elbunce/iaxclient/lib/ringbuffer.c
Added Paths:
-----------
branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient.dsw
branches/team/elbunce/iaxclient/contrib/win/vc6/libgsm.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/libiax2.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/libiaxclient.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/libogg.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/libportaudio.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/libportmixer.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/libspeex.dsp
Removed Paths:
-------------
branches/team/elbunce/iaxclient/contrib/win/vc6/all.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_dll.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_lib.dsp
branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_lib.dsw
Deleted: branches/team/elbunce/iaxclient/contrib/win/vc6/all.dsp
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/all.dsp 2007-11-28 05:19:17 UTC (rev 1286)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/all.dsp 2007-11-28 05:30:17 UTC (rev 1287)
@@ -1,63 +0,0 @@
-# Microsoft Developer Studio Project File - Name="all" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=all - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "all.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "all.mak" CFG="all - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "all - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "all - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF "$(CFG)" == "all - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-
-!ELSEIF "$(CFG)" == "all - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-
-!ENDIF
-
-# Begin Target
-
-# Name "all - Win32 Release"
-# Name "all - Win32 Debug"
-# End Target
-# End Project
Copied: branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient.dsw (from rev 1286, trunk/contrib/win/vc6/iaxclient.dsw)
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient.dsw (rev 0)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient.dsw 2007-11-28 05:30:17 UTC (rev 1287)
@@ -0,0 +1,147 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libgsm"=.\libgsm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ Perforce Project
+ .
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libiax2"=.\libiax2.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libiax2
+ ..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libiaxclient"=.\libiaxclient.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ Perforce Project
+ .
+ end source code control
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libgsm
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libiax2
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libogg
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libportaudio
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libportmixer
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libspeex
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libogg"=.\libogg.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libogg
+ ..\..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libportaudio"=.\libportaudio.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libportaudio
+ ..\..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libportmixer"=.\libportmixer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libportmixer
+ ..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libspeex"=.\libspeex.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libspeex
+ ..\..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Deleted: branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_dll.dsp
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_dll.dsp 2007-11-28 05:19:17 UTC (rev 1286)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_dll.dsp 2007-11-28 05:30:17 UTC (rev 1287)
@@ -1,699 +0,0 @@
-# Microsoft Developer Studio Project File - Name="iaxclient_dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=iaxclient_dll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "iaxclient_dll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "iaxclient_dll.mak" CFG="iaxclient_dll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "iaxclient_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "iaxclient_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "iaxclient_dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "_WINDLL" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /w /W0 /GX /I ".." /I "..\..\gsm\inc" /I "..\..\portaudio\include" /I "..\..\portaudio\src\common" /I "..\..\portaudio\pablio" /I "..\..\portmixer\px_common" /I "..\..\libspeex\include" /I "..\..\libiax2\src" /I "..\..\wince" /D "WIN32" /D "NDEBUG" /D "_USRDLL" /D "_WINDLL" /D "PA_NO_DS" /D "PA_NO_ASIO" /D SPEEX_PREPROCESS=1 /D "NEWJB" /D "LIBIAX" /D SPEEX_EC=1 /D inline=__inline /D strncasecmp=strnicmp /D vsnprintf=_vsnprintf /FD /c
-# SUBTRACT CPP /X /Fr /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"ReleaseDLL/iaxclient.dll"
-
-!ELSEIF "$(CFG)" == "iaxclient_dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "_WINDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /MDd /w /W0 /Gm /GX /Zi /Od /I ".." /I "..\..\gsm\inc" /I "..\..\portaudio\include" /I "..\..\portaudio\src\common" /I "..\..\portaudio\pablio" /I "..\..\portmixer\px_common" /I "..\..\libspeex\include" /I "..\..\libiax2\src" /I "..\..\wince" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_WINDLL" /D "BUILDING_DLL" /D "PA_NO_DS" /D "PA_NO_ASIO" /D SPEEX_PREPROCESS=1 /D "NEWJB" /D "LIBIAX" /D SPEEX_EC=1 /D inline=__inline /D strncasecmp=strnicmp /D vsnprintf=_vsnprintf /FD /GZ /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 msvcrt.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"DebugDLL/iaxclient.dll"
-
-!ENDIF
-
-# Begin Target
-
-# Name "iaxclient_dll - Win32 Release"
-# Name "iaxclient_dll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\audio_encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_portaudio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_alaw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_gsm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_speex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_ulaw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\iax.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\libiax2\src\iax2-parser.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\iaxclient_dll.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient_lib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\jitterbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\winfuncs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\audio_encode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_portaudio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_alaw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_gsm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_speex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_ulaw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\iax.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\libiax2\src\iax2-parser.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient_lib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\jitterbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\md5.h
-# End Source File
-# End Group
-# Begin Group "DSP"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\spandsp\plc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\spandsp\plc.h
-# End Source File
-# End Group
-# Begin Group "GSM"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\gsm\src\add.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\code.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\gsm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_create.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_destroy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_explode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_implode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_option.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_print.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\k6opt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\long_term.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\lpc.c
-
-!IF "$(CFG)" == "iaxclient_dll - Win32 Release"
-
-# PROP Intermediate_Dir "ReleaseDLL\gsm"
-
-!ELSEIF "$(CFG)" == "iaxclient_dll - Win32 Debug"
-
-# PROP Intermediate_Dir "DebugDLL\gsm"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\preprocess.c
-
-!IF "$(CFG)" == "iaxclient_dll - Win32 Release"
-
-# PROP Intermediate_Dir "ReleaseDLL\gsm"
-
-!ELSEIF "$(CFG)" == "iaxclient_dll - Win32 Debug"
-
-# PROP Intermediate_Dir "DebugDLL\gsm"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\private.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\proto.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\rpe.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\short_term.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\unproto.h
-# End Source File
-# End Group
-# Begin Group "PortAudio"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_allocation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_allocation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_converters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_converters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_cpuload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_cpuload.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_dither.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_dither.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_endianness.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_front.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_hostapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_process.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_skeleton.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_stream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_trace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_trace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\os\win\pa_win_hostapis.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\os\win\pa_win_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\pablio\ringbuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\pablio\ringbuffer.h
-# End Source File
-# End Group
-# Begin Group "PortMixer"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\portmixer\px_win_wmme\px_win_wmme.cpp
-# End Source File
-# End Group
-# Begin Group "Speex"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\libspeex\arch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\bits.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_10_16_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_10_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_20_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_5_256_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_5_64_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_8_128_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters_arm4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\fixed_debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\fixed_generic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\gain_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\gain_table_lbr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\hexc_10_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\hexc_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\high_lsp_tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\jitter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lbr_48k_tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lpc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lpc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp_tables_nb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\math_approx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\math_approx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\mdf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\medfilter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\medfilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\nb_celp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\nb_celp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\preprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\quant_lsp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\quant_lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\sb_celp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\sb_celp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\smallft.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\smallft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sox\sox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex_callbacks.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex_header.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stack_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stereo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.h
-# End Source File
-# End Group
-# End Target
-# End Project
Deleted: branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_lib.dsp
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_lib.dsp 2007-11-28 05:19:17 UTC (rev 1286)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_lib.dsp 2007-11-28 05:30:17 UTC (rev 1287)
@@ -1,688 +0,0 @@
-# Microsoft Developer Studio Project File - Name="iaxclient_lib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=iaxclient_lib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "iaxclient_lib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "iaxclient_lib.mak" CFG="iaxclient_lib - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "iaxclient_lib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "iaxclient_lib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "iaxclient_lib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseLIB"
-# PROP Intermediate_Dir "ReleaseLIB"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /w /W0 /GX /I ".." /I "..\..\gsm\inc" /I "..\..\portaudio\include" /I "..\..\portaudio\src\common" /I "..\..\portaudio\pablio" /I "..\..\portmixer\px_common" /I "..\..\libspeex\include" /I "..\..\libiax2\src" /I "..\..\wince" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D SPEEX_PREPROCESS=1 /D "NEWJB" /D "LIBIAX" /D SPEEX_EC=1 /D inline=__inline /D strncasecmp=strnicmp /D vsnprintf=_vsnprintf /FD /c
-# SUBTRACT CPP /X /Fr /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"ReleaseLIB\iaxclient1.lib"
-
-!ELSEIF "$(CFG)" == "iaxclient_lib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugLIB"
-# PROP Intermediate_Dir "DebugLIB"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /MDd /w /W0 /Gm /GX /Zi /Od /I ".." /I "..\..\gsm\inc" /I "..\..\portaudio\include" /I "..\..\portaudio\src\common" /I "..\..\portaudio\pablio" /I "..\..\portmixer\px_common" /I "..\..\libspeex\include" /I "..\..\libiax2\src" /I "..\..\wince" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D SPEEX_PREPROCESS=1 /D "NEWJB" /D "LIBIAX" /D SPEEX_EC=1 /D inline=__inline /D strncasecmp=strnicmp /D vsnprintf=_vsnprintf /FD /GZ /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"DebugLIB\iaxclient1.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "iaxclient_lib - Win32 Release"
-# Name "iaxclient_lib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\audio_encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_portaudio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_alaw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_gsm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_speex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_ulaw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\iax.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\libiax2\src\iax2-parser.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient_lib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\jitterbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\winfuncs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\audio_encode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_portaudio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_alaw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_gsm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_speex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_ulaw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\iax.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\libiax2\src\iax2-parser.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient_lib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\jitterbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\md5.h
-# End Source File
-# End Group
-# Begin Group "DSP"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\spandsp\plc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\spandsp\plc.h
-# End Source File
-# End Group
-# Begin Group "GSM"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\gsm\src\add.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\code.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\gsm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_create.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_destroy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_explode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_implode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_option.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_print.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\k6opt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\long_term.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\lpc.c
-
-!IF "$(CFG)" == "iaxclient_lib - Win32 Release"
-
-# PROP Intermediate_Dir "ReleaseLIB\gsm"
-
-!ELSEIF "$(CFG)" == "iaxclient_lib - Win32 Debug"
-
-# PROP Intermediate_Dir "DebugLIB\gsm"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\preprocess.c
-
-!IF "$(CFG)" == "iaxclient_lib - Win32 Release"
-
-# PROP Intermediate_Dir "ReleaseLIB\gsm"
-
-!ELSEIF "$(CFG)" == "iaxclient_lib - Win32 Debug"
-
-# PROP Intermediate_Dir "DebugLIB\gsm"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\private.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\proto.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\rpe.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\short_term.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\unproto.h
-# End Source File
-# End Group
-# Begin Group "PortAudio"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_allocation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_allocation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_converters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_converters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_cpuload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_cpuload.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_dither.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_dither.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_endianness.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_front.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_hostapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_process.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_skeleton.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_stream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_trace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_trace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\os\win\pa_win_hostapis.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\os\win\pa_win_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\pablio\ringbuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\pablio\ringbuffer.h
-# End Source File
-# End Group
-# Begin Group "PortMixer"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\portmixer\px_win_wmme\px_win_wmme.cpp
-# End Source File
-# End Group
-# Begin Group "Speex"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\libspeex\arch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\bits.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_10_16_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_10_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_20_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_5_256_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_5_64_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_8_128_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters_arm4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\fixed_debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\fixed_generic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\gain_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\gain_table_lbr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\hexc_10_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\hexc_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\high_lsp_tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\jitter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lbr_48k_tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lpc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lpc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp_tables_nb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\math_approx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\math_approx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\mdf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\medfilter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\medfilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\nb_celp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\nb_celp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\preprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\quant_lsp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\quant_lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\sb_celp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\sb_celp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\smallft.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\smallft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sox\sox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex_callbacks.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex_header.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stack_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stereo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.h
-# End Source File
-# End Group
-# End Target
-# End Project
Deleted: branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_lib.dsw
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_lib.dsw 2007-11-28 05:19:17 UTC (rev 1286)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/iaxclient_lib.dsw 2007-11-28 05:30:17 UTC (rev 1287)
@@ -1,59 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "all"=.\all.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name iaxclient_dll
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iaxclient_lib
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "iaxclient_dll"=.\iaxclient_dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "iaxclient_lib"=.\iaxclient_lib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
Copied: branches/team/elbunce/iaxclient/contrib/win/vc6/libgsm.dsp (from rev 1286, trunk/contrib/win/vc6/libgsm.dsp)
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/libgsm.dsp (rev 0)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/libgsm.dsp 2007-11-28 05:30:17 UTC (rev 1287)
@@ -0,0 +1,186 @@
+# Microsoft Developer Studio Project File - Name="libgsm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libgsm - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libgsm.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libgsm.mak" CFG="libgsm - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libgsm - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libgsm - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "Perforce Project"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libgsm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "i386rel"
+# PROP BASE Intermediate_Dir "i386rel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libgsm"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /w /W0 /GX /I "..\..\..\lib\gsm\inc" /D "WIN32" /D "NDEBUG" /D "_LIB" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libgsm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "i386dbg"
+# PROP BASE Intermediate_Dir "i386dbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\libgsm"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\gsm\inc" /D "WIN32" /D "_DEBUG" /D "_LIB" /Fr /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libgsm - Win32 Release"
+# Name "libgsm - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\add.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\code.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\debug.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\decode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_decode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_destroy.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_encode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_explode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_implode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_option.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_print.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\long_term.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\lpc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\preprocess.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\rpe.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\short_term.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\table.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\gsm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\private.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\proto.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\unproto.h
+# End Source File
+# End Group
+# End Target
+# End Project
Copied: branches/team/elbunce/iaxclient/contrib/win/vc6/libiax2.dsp (from rev 1286, trunk/contrib/win/vc6/libiax2.dsp)
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/libiax2.dsp (rev 0)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/libiax2.dsp 2007-11-28 05:30:17 UTC (rev 1287)
@@ -0,0 +1,168 @@
+# Microsoft Developer Studio Project File - Name="libiax2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libiax2 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libiax2.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libiax2.mak" CFG="libiax2 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libiax2 - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libiax2 - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "libiax2"
+# PROP Scc_LocalPath "..\..\..\.."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libiax2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libiax2"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_LIB" /D "LIBIAX" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libiax2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\libiax2"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_LIB" /D "LIBIAX" /D "_CRT_SECURE_NO_DEPRECATE" /D NTDDI_VERSION=NTDDI_WIN2KSP4 /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libiax2 - Win32 Release"
+# Name "libiax2 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\iax.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\lib\libiax2\src\iax2-parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\jitterbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\md5.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\answer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\busy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\dialtone.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\frame.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\lib\libiax2\src\iax-client.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\iax.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\lib\libiax2\src\iax2-parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\iax2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\jitterbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\miniphone.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\options.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\ring10.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\ringtone.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\winpoop.h
+# End Source File
+# End Group
+# End Target
+# End Project
Copied: branches/team/elbunce/iaxclient/contrib/win/vc6/libiaxclient.dsp (from rev 1286, trunk/contrib/win/vc6/libiaxclient.dsp)
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/libiaxclient.dsp (rev 0)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/libiaxclient.dsp 2007-11-28 05:30:17 UTC (rev 1287)
@@ -0,0 +1,178 @@
+# Microsoft Developer Studio Project File - Name="libiaxclient" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libiaxclient - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libiaxclient.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libiaxclient.mak" CFG="libiaxclient - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libiaxclient - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libiaxclient - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "Perforce Project"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libiaxclient - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "i386rel"
+# PROP BASE Intermediate_Dir "i386rel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libiaxclient"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /w /W0 /GX /I "..\..\..\lib\libiax2\src" /I "..\..\..\..\portaudio\include" /I "..\..\..\lib\spandsp" /I "..\..\..\lib\gsm\inc" /I "..\..\..\..\speex\include" /I "..\..\..\..\libogg\include" /I "..\..\..\lib\portmixer\px_common" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D "BUILDING_DLL" /D "LIBIAX" /D SPEEX_EC=1 /D "ALLOW_SMP_DANGERS" /D "_CRT_SECURE_NO_DEPRECATE" /D log10f=log10 /D vsnprintf=_vsnprintf /D strncasecmp=strnicmp /D __inline__=_inline /D inline=__inline /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libiaxclient - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "i386dbg"
+# PROP BASE Intermediate_Dir "i386dbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\libiaxclient"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\libiax2\src" /I "..\..\..\..\portaudio\include" /I "..\..\..\lib\spandsp" /I "..\..\..\lib\gsm\inc" /I "..\..\..\..\speex\include" /I "..\..\..\..\libogg\include" /I "..\..\..\lib\portmixer\px_common" /D "_DEBUG" /D "WIN32" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D "BUILDING_DLL" /D "LIBIAX" /D SPEEX_EC=1 /D "ALLOW_SMP_DANGERS" /D "_CRT_SECURE_NO_DEPRECATE" /D log10f=log10 /D vsnprintf=_vsnprintf /D strncasecmp=strnicmp /D __inline__=_inline /D inline=__inline /Fr /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libiaxclient - Win32 Release"
+# Name "libiaxclient - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\lib\audio_encode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\audio_portaudio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_alaw.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_gsm.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_speex.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_ulaw.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\iaxclient_lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\spandsp\plc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\ringbuffer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\winfuncs.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\lib\audio_alsa.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\audio_portaudio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_alaw.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_ffmpeg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_gsm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_ilbc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_speex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_ulaw.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\iaxclient.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\iaxclient_lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\ringbuffer.h
+# End Source File
+# End Group
+# End Target
+# End Project
Copied: branches/team/elbunce/iaxclient/contrib/win/vc6/libogg.dsp (from rev 1286, trunk/contrib/win/vc6/libogg.dsp)
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/libogg.dsp (rev 0)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/libogg.dsp 2007-11-28 05:30:17 UTC (rev 1287)
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="libogg" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libogg - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libogg.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libogg.mak" CFG="libogg - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libogg - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libogg - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "libogg"
+# PROP Scc_LocalPath "..\..\..\..\.."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libogg - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libogg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\libogg\include" /D "WIN32" /D "NDEBUG" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libogg - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\libogg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\libogg\include" /D "WIN32" /D "_DEBUG" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libogg - Win32 Release"
+# Name "libogg - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\libogg\src\bitwise.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\libogg\src\framing.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\libogg\include\ogg\ogg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\libogg\include\ogg\os_types.h
+# End Source File
+# End Group
+# End Target
+# End Project
Copied: branches/team/elbunce/iaxclient/contrib/win/vc6/libportaudio.dsp (from rev 1286, trunk/contrib/win/vc6/libportaudio.dsp)
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vc6/libportaudio.dsp (rev 0)
+++ branches/team/elbunce/iaxclient/contrib/win/vc6/libportaudio.dsp 2007-11-28 05:30:17 UTC (rev 1287)
@@ -0,0 +1,220 @@
+# Microsoft Developer Studio Project File - Name="libportaudio" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libportaudio - Win32 Debug
+!MESSAGE This is not a valid...
[truncated message content] |
|
From: <do...@us...> - 2007-11-28 05:19:12
|
Revision: 1286
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1286&view=rev
Author: dohpaz
Date: 2007-11-27 21:19:17 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
Fix oops.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
Modified: branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c 2007-11-28 04:08:06 UTC (rev 1285)
+++ branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c 2007-11-28 05:19:17 UTC (rev 1286)
@@ -1423,7 +1423,7 @@
s0->transferpeer = s1->callno;
s1->transferpeer = s0->callno;
- DEBU(G fprintf(stderr, "iax_setup_transfer(%d, %d) transfer_id=%d\n", s0->callno, s1->callno, transfer_id);
+ DEBU(G "iax_setup_transfer(%d, %d) transfer_id=%d\n", s0->callno, s1->callno, transfer_id);
res = send_command(s0, AST_FRAME_IAX, IAX_COMMAND_TXREQ, 0, ied0.buf, ied0.pos, -1);
if (res < 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <do...@us...> - 2007-11-28 04:08:04
|
Revision: 1285
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1285&view=rev
Author: dohpaz
Date: 2007-11-27 20:08:06 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
Add iax_seed_random() and iax_random() that will use the best random number generation I can find on a particular platform. Fall back to rand() in desperation. Lower 12 bits of rand() are not very random on many platforms, one should NEVER do a straight modulus of it's return value.
Add myself to contributors for various files I've contributed to.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/AUTHORS
branches/team/elbunce/iaxclient/configure.ac
branches/team/elbunce/iaxclient/lib/audio_encode.c
branches/team/elbunce/iaxclient/lib/audio_portaudio.c
branches/team/elbunce/iaxclient/lib/iaxclient_lib.c
branches/team/elbunce/iaxclient/lib/libiax2/src/iax-client.h
branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
branches/team/elbunce/iaxclient/lib/video.c
Modified: branches/team/elbunce/iaxclient/AUTHORS
===================================================================
--- branches/team/elbunce/iaxclient/AUTHORS 2007-11-26 22:02:43 UTC (rev 1284)
+++ branches/team/elbunce/iaxclient/AUTHORS 2007-11-28 04:08:06 UTC (rev 1285)
@@ -9,7 +9,7 @@
Steve Underwood <st...@co...> [PLC implementation from spandsp]
Jean-Denis Girard <jd....@sy...> [URL Receive implementation]
Panfilov Dmitry <di...@bd...> [Basic ALSA-native audio driver]
-Erik Bunce <kd...@bu...> [Assorted fixes/tweaks, Documentation]
+Erik Bunce <kd...@bu...> [Assorted fixes/tweaks/features, Documentation]
Mihai Balea <mihai at hates dot ms>
Bill Welch <welch1820 at gmail dot com> [Project files for several MS development environments]
Peter Grayson <jpg...@gm...>
Modified: branches/team/elbunce/iaxclient/configure.ac
===================================================================
--- branches/team/elbunce/iaxclient/configure.ac 2007-11-26 22:02:43 UTC (rev 1284)
+++ branches/team/elbunce/iaxclient/configure.ac 2007-11-28 04:08:06 UTC (rev 1285)
@@ -46,6 +46,7 @@
AC_TYPE_SIZE_T
AC_CHECK_FUNCS([vsnprintf _vsnprintf])
+AC_CHECK_FUNCS([srandomdev srandom srand48 random lrand48])
ACX_PTHREAD
Modified: branches/team/elbunce/iaxclient/lib/audio_encode.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/audio_encode.c 2007-11-26 22:02:43 UTC (rev 1284)
+++ branches/team/elbunce/iaxclient/lib/audio_encode.c 2007-11-28 04:08:06 UTC (rev 1285)
@@ -327,7 +327,7 @@
if(iax_send_voice(call->session,format, outbuf,
sizeof(outbuf) - outsize, samples-insize) == -1)
{
- puts("Failed to send voice!");
+ fprintf(stderr, "Failed to send voice! %s\n", iax_errstr);
return -1;
}
Modified: branches/team/elbunce/iaxclient/lib/audio_portaudio.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/audio_portaudio.c 2007-11-26 22:02:43 UTC (rev 1284)
+++ branches/team/elbunce/iaxclient/lib/audio_portaudio.c 2007-11-28 04:08:06 UTC (rev 1285)
@@ -9,6 +9,7 @@
* Steve Kann <st...@st...>
* Michael Van Donselaar <mv...@va...>
* Shawn Lawrence <sha...@te...>
+ * Erik Bunce <kd...@bu...>
*
* This program is free software, distributed under the terms of
* the GNU Lesser (Library) General Public License.
Modified: branches/team/elbunce/iaxclient/lib/iaxclient_lib.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/iaxclient_lib.c 2007-11-26 22:02:43 UTC (rev 1284)
+++ branches/team/elbunce/iaxclient/lib/iaxclient_lib.c 2007-11-28 04:08:06 UTC (rev 1285)
@@ -13,6 +13,7 @@
* Mihai Balea <mihai AT hates DOT ms>
* Peter Grayson <jpg...@gm...>
* Bill Cholewka <bc...@gm...>
+ * Erik Bunce <kd...@bu...>
*
* This program is free software, distributed under the terms of
* the GNU Lesser (Library) General Public License.
Modified: branches/team/elbunce/iaxclient/lib/libiax2/src/iax-client.h
===================================================================
--- branches/team/elbunce/iaxclient/lib/libiax2/src/iax-client.h 2007-11-26 22:02:43 UTC (rev 1284)
+++ branches/team/elbunce/iaxclient/lib/libiax2/src/iax-client.h 2007-11-28 04:08:06 UTC (rev 1285)
@@ -245,6 +245,10 @@
/* Fine tune jitterbuffer */
extern void iax_set_jb_target_extra( long value );
+/* Portable 'decent' random number generation */
+void iax_seed_random();
+int iax_random();
+
#if defined(__cplusplus)
}
#endif
Modified: branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c 2007-11-26 22:02:43 UTC (rev 1284)
+++ branches/team/elbunce/iaxclient/lib/libiax2/src/iax.c 2007-11-28 04:08:06 UTC (rev 1285)
@@ -314,9 +314,31 @@
static struct iax_sched *schedq = NULL;
static struct iax_session *sessions = NULL;
static int callnums = 1;
-static int transfer_id = 1; /* for attended transfer */
+void iax_seed_random()
+{
+#if defined(HAVE_SRANDOMDEV)
+ srandomdev();
+#elif defined(HAVE_SRANDOM)
+ srandom((unsigned int)time(0));
+#elif define(HAVE_SRAND48)
+ srand48((long int)time(0));
+#else
+ srand((unsigned int)time(0));
+#endif
+}
+int iax_random()
+{
+#if defined(HAVE_RANDOM)
+ return (int)random();
+#elif defined(HAVE_LRAND48)
+ return (int)lrand48();
+#else
+ return rand();
+#endif
+}
+
void iax_set_private(struct iax_session *s, void *ptr)
{
s->pvt = ptr;
@@ -979,9 +1001,8 @@
DEBU(G "Started on port %d\n", portno);
}
- srand((unsigned int)time(0));
- callnums = rand() % 32767 + 1;
- transfer_id = rand() % 32767 + 1;
+ iax_seed_random();
+ callnums = 1 + (int)(32767.0 * (iax_random() / (RAND_MAX + 1.0)));
return portno;
}
@@ -1373,8 +1394,11 @@
struct iax_session *s1 = new_session;
memset(&ied0, 0, sizeof(ied0));
+
memset(&ied1, 0, sizeof(ied1));
+ int transfer_id = 1 + (int)(32767.0 * (iax_random() / (RAND_MAX + 1.0)));
+
/* reversed setup */
iax_ie_append_addr(&ied0, IAX_IE_APPARENT_ADDR, &s1->peeraddr);
iax_ie_append_short(&ied0, IAX_IE_CALLNO, s1->peercallno);
@@ -1399,11 +1423,8 @@
s0->transferpeer = s1->callno;
s1->transferpeer = s0->callno;
- transfer_id++;
+ DEBU(G fprintf(stderr, "iax_setup_transfer(%d, %d) transfer_id=%d\n", s0->callno, s1->callno, transfer_id);
- if (transfer_id > 32767)
- transfer_id = 1;
-
res = send_command(s0, AST_FRAME_IAX, IAX_COMMAND_TXREQ, 0, ied0.buf, ied0.pos, -1);
if (res < 0) {
return -1;
Modified: branches/team/elbunce/iaxclient/lib/video.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/video.c 2007-11-26 22:02:43 UTC (rev 1284)
+++ branches/team/elbunce/iaxclient/lib/video.c 2007-11-28 04:08:06 UTC (rev 1285)
@@ -9,6 +9,7 @@
* Steve Kann <st...@st...>
* Mihai Balea <mihai AT hates DOT ms>
* Peter Grayson <jpg...@gm...>
+ * Erik Bunce <kd...@bu...>
*
* This program is free software, distributed under the terms of
* the GNU Lesser (Library) General Public License.
@@ -1789,8 +1790,8 @@
) == -1
)
{
- fprintf(stderr, "Failed to send a slice, call %d, size %d\n",
- selected_call, slice_set.size[i]);
+ fprintf(stderr, "Failed to send a slice, call %d, size %d: %s\n",
+ selected_call, slice_set.size[i], iax_errstr);
return -1;
}
@@ -1801,8 +1802,8 @@
size, 0, 0) == -1 )
{
fprintf(stderr, "iaxc_push_video: failed to send "
- "video frame of size %d on call %d\n",
- size, selected_call);
+ "video frame of size %d on call %d: %s\n",
+ size, selected_call, iax_errstr);
return -1;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bc...@us...> - 2007-11-26 22:02:38
|
Revision: 1284
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1284&view=rev
Author: bcholew
Date: 2007-11-26 14:02:43 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
Be consistent when destroying encoders and decoders.
Modified Paths:
--------------
trunk/lib/iaxclient_lib.c
Modified: trunk/lib/iaxclient_lib.c
===================================================================
--- trunk/lib/iaxclient_lib.c 2007-11-25 12:32:28 UTC (rev 1283)
+++ trunk/lib/iaxclient_lib.c 2007-11-26 22:02:43 UTC (rev 1284)
@@ -682,9 +682,9 @@
if ( calls[i].decoder )
calls[i].decoder->destroy(calls[i].decoder);
if ( calls[i].vencoder )
- calls[i].vdecoder->destroy(calls[i].vencoder);
+ calls[i].vencoder->destroy(calls[i].vencoder);
if ( calls[i].vdecoder )
- calls[i].vencoder->destroy(calls[i].vdecoder);
+ calls[i].vdecoder->destroy(calls[i].vdecoder);
}
free(calls);
calls = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2007-11-25 12:32:24
|
Revision: 1283
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1283&view=rev
Author: jpgrayson
Date: 2007-11-25 04:32:28 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
Build fixes for VC6 courtesy of Teri Schoech. Thank you again.
Modified Paths:
--------------
trunk/lib/iaxclient_lib.h
trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
trunk/lib/ringbuffer.c
Modified: trunk/lib/iaxclient_lib.h
===================================================================
--- trunk/lib/iaxclient_lib.h 2007-11-25 12:31:48 UTC (rev 1282)
+++ trunk/lib/iaxclient_lib.h 2007-11-25 12:32:28 UTC (rev 1283)
@@ -71,6 +71,9 @@
#define THREADJOIN(t)
/* causes deadlock with wx GUI on MSW */
/* #define THREADJOIN(t) WaitForSingleObject(t, INFINITE) */
+#ifndef _WIN32_WINNT
+extern WINBASEAPI BOOL WINAPI TryEnterCriticalSection( LPCRITICAL_SECTION lpCriticalSection );
+#endif
#define MUTEX CRITICAL_SECTION
#define MUTEXINIT(m) InitializeCriticalSection(m)
#define MUTEXLOCK(m) EnterCriticalSection(m)
Modified: trunk/lib/portmixer/px_win_wmme/px_win_wmme.c
===================================================================
--- trunk/lib/portmixer/px_win_wmme/px_win_wmme.c 2007-11-25 12:31:48 UTC (rev 1282)
+++ trunk/lib/portmixer/px_win_wmme/px_win_wmme.c 2007-11-25 12:32:28 UTC (rev 1283)
@@ -626,7 +626,14 @@
int Px_SetMicrophoneBoost( PxMixer* mixer, int enable )
{
+ MIXERLINE mixerLine ;
+ LPMIXERCONTROL mixerControl ;
+ MIXERLINECONTROLS mixerLineControls ;
+ MIXERCONTROLDETAILS mixerControlDetails ;
+ MIXERCONTROLDETAILS_BOOLEAN value ;
MMRESULT mmr = MMSYSERR_ERROR ;
+ DWORD boost_id = -1 ;
+ DWORD x ;
// cast void pointer
PxInfo* info = ( PxInfo* )( mixer ) ;
@@ -638,7 +645,6 @@
// get line info
//
- MIXERLINE mixerLine ;
mixerLine.cbStruct = sizeof( MIXERLINE ) ;
mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE ;
@@ -655,9 +661,8 @@
// get all controls
//
- LPMIXERCONTROL mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
+ mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
- MIXERLINECONTROLS mixerLineControls ;
mixerLineControls.cbStruct = sizeof( MIXERLINECONTROLS ) ;
mixerLineControls.dwLineID = mixerLine.dwLineID ;
mixerLineControls.cControls = mixerLine.cControls ;
@@ -681,10 +686,7 @@
// find boost control
//
- DWORD boost_id = -1 ;
- DWORD x = 0 ;
-
- for ( ; x < mixerLineControls.cControls ; ++x )
+ for ( x = 0 ; x < mixerLineControls.cControls ; ++x )
{
// check control type
if ( mixerControl[x].dwControlType & MIXERCONTROL_CONTROLTYPE_BOOLEAN )
@@ -715,9 +717,6 @@
// get control details
//
- MIXERCONTROLDETAILS_BOOLEAN value ;
-
- MIXERCONTROLDETAILS mixerControlDetails ;
mixerControlDetails.cbStruct = sizeof( MIXERCONTROLDETAILS ) ;
mixerControlDetails.dwControlID = boost_id ;
mixerControlDetails.cChannels = 1 ;
@@ -764,7 +763,14 @@
int Px_GetMicrophoneBoost( PxMixer* mixer )
{
+ MIXERLINE mixerLine ;
+ LPMIXERCONTROL mixerControl ;
+ MIXERLINECONTROLS mixerLineControls ;
+ MIXERCONTROLDETAILS mixerControlDetails ;
+ MIXERCONTROLDETAILS_BOOLEAN value ;
MMRESULT mmr = MMSYSERR_ERROR ;
+ DWORD boost_id = -1 ;
+ DWORD x ;
// cast void pointer
PxInfo* info = ( PxInfo* )( mixer ) ;
@@ -776,7 +782,6 @@
// get line info
//
- MIXERLINE mixerLine ;
mixerLine.cbStruct = sizeof( MIXERLINE ) ;
mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE ;
@@ -793,9 +798,8 @@
// get all controls
//
- LPMIXERCONTROL mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
+ mixerControl = (MIXERCONTROL *)malloc( sizeof( MIXERCONTROL ) * mixerLine.cControls ) ;
- MIXERLINECONTROLS mixerLineControls ;
mixerLineControls.cbStruct = sizeof( MIXERLINECONTROLS ) ;
mixerLineControls.dwLineID = mixerLine.dwLineID ;
mixerLineControls.cControls = mixerLine.cControls ;
@@ -819,10 +823,7 @@
// find boost control
//
- DWORD boost_id = -1 ;
- DWORD x = 0 ;
-
- for ( ; x < mixerLineControls.cControls ; ++x )
+ for ( x = 0 ; x < mixerLineControls.cControls ; ++x )
{
// check control type
if ( mixerControl[x].dwControlType & MIXERCONTROL_CONTROLTYPE_BOOLEAN )
@@ -853,9 +854,6 @@
// get control details
//
- MIXERCONTROLDETAILS_BOOLEAN value ;
-
- MIXERCONTROLDETAILS mixerControlDetails ;
mixerControlDetails.cbStruct = sizeof( MIXERCONTROLDETAILS ) ;
mixerControlDetails.dwControlID = boost_id ;
mixerControlDetails.cChannels = 1 ;
@@ -879,6 +877,8 @@
int Px_SetCurrentInputSourceByName( PxMixer* mixer, const char* name )
{
+ int x ;
+
// cast void pointer
PxInfo* info = ( PxInfo* )( mixer ) ;
@@ -894,8 +894,7 @@
// set input source
//
- int x = 0 ;
- for ( ; x < info->numInputs ; ++x )
+ for ( x = 0 ; x < info->numInputs ; ++x )
{
// compare passed name with control name
if ( strncasecmp( info->src[x].name, name, strlen( name ) ) == 0 )
Modified: trunk/lib/ringbuffer.c
===================================================================
--- trunk/lib/ringbuffer.c 2007-11-25 12:31:48 UTC (rev 1282)
+++ trunk/lib/ringbuffer.c 2007-11-25 12:32:28 UTC (rev 1283)
@@ -125,22 +125,29 @@
# endif
# endif
#elif defined(_MSC_VER)
-# include <intrin.h>
-# pragma intrinsic(_ReadWriteBarrier)
-# pragma intrinsic(_ReadBarrier)
-# pragma intrinsic(_WriteBarrier)
-# define rb_FullMemoryBarrier() _ReadWriteBarrier()
-# define rb_ReadMemoryBarrier() _ReadBarrier()
-# define rb_WriteMemoryBarrier() _WriteBarrier()
-#else
-# ifdef ALLOW_SMP_DANGERS
-# ifdef _MSC_VER
+# if ( _MSC_VER > 1200 )
+# include <intrin.h>
+# pragma intrinsic(_ReadWriteBarrier)
+# pragma intrinsic(_ReadBarrier)
+# pragma intrinsic(_WriteBarrier)
+# define rb_FullMemoryBarrier() _ReadWriteBarrier()
+# define rb_ReadMemoryBarrier() _ReadBarrier()
+# define rb_WriteMemoryBarrier() _WriteBarrier()
+# else
+# ifdef ALLOW_SMP_DANGERS
# pragma message("Memory barriers not defined on this system or system unknown")
# pragma message("For SMP safety, you should fix this.")
+# define rb_FullMemoryBarrier()
+# define rb_ReadMemoryBarrier()
+# define rb_WriteMemoryBarrier()
# else
-# warning Memory barriers not defined on this system or system unknown
-# warning For SMP safety, you should fix this.
+# error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed.
# endif
+# endif
+#else
+# ifdef ALLOW_SMP_DANGERS
+# warning Memory barriers not defined on this system or system unknown
+# warning For SMP safety, you should fix this.
# define rb_FullMemoryBarrier()
# define rb_ReadMemoryBarrier()
# define rb_WriteMemoryBarrier()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2007-11-25 12:31:44
|
Revision: 1282
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1282&view=rev
Author: jpgrayson
Date: 2007-11-25 04:31:48 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
Replace old VC6 project foo with new VC6 project foo courtesy of Teri Schoech. Thank you!
Added Paths:
-----------
trunk/contrib/win/vc6/iaxclient.dsw
trunk/contrib/win/vc6/libgsm.dsp
trunk/contrib/win/vc6/libiax2.dsp
trunk/contrib/win/vc6/libiaxclient.dsp
trunk/contrib/win/vc6/libogg.dsp
trunk/contrib/win/vc6/libportaudio.dsp
trunk/contrib/win/vc6/libportmixer.dsp
trunk/contrib/win/vc6/libspeex.dsp
Removed Paths:
-------------
trunk/contrib/win/vc6/all.dsp
trunk/contrib/win/vc6/iaxclient_dll.dsp
trunk/contrib/win/vc6/iaxclient_lib.dsp
trunk/contrib/win/vc6/iaxclient_lib.dsw
Deleted: trunk/contrib/win/vc6/all.dsp
===================================================================
--- trunk/contrib/win/vc6/all.dsp 2007-11-22 00:15:53 UTC (rev 1281)
+++ trunk/contrib/win/vc6/all.dsp 2007-11-25 12:31:48 UTC (rev 1282)
@@ -1,63 +0,0 @@
-# Microsoft Developer Studio Project File - Name="all" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=all - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "all.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "all.mak" CFG="all - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "all - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "all - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF "$(CFG)" == "all - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-
-!ELSEIF "$(CFG)" == "all - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-
-!ENDIF
-
-# Begin Target
-
-# Name "all - Win32 Release"
-# Name "all - Win32 Debug"
-# End Target
-# End Project
Added: trunk/contrib/win/vc6/iaxclient.dsw
===================================================================
--- trunk/contrib/win/vc6/iaxclient.dsw (rev 0)
+++ trunk/contrib/win/vc6/iaxclient.dsw 2007-11-25 12:31:48 UTC (rev 1282)
@@ -0,0 +1,147 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libgsm"=.\libgsm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ Perforce Project
+ .
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libiax2"=.\libiax2.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libiax2
+ ..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libiaxclient"=.\libiaxclient.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ Perforce Project
+ .
+ end source code control
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libgsm
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libiax2
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libogg
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libportaudio
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libportmixer
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libspeex
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libogg"=.\libogg.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libogg
+ ..\..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libportaudio"=.\libportaudio.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libportaudio
+ ..\..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libportmixer"=.\libportmixer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libportmixer
+ ..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libspeex"=.\libspeex.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+ begin source code control
+ libspeex
+ ..\..\..\..\..
+ end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Deleted: trunk/contrib/win/vc6/iaxclient_dll.dsp
===================================================================
--- trunk/contrib/win/vc6/iaxclient_dll.dsp 2007-11-22 00:15:53 UTC (rev 1281)
+++ trunk/contrib/win/vc6/iaxclient_dll.dsp 2007-11-25 12:31:48 UTC (rev 1282)
@@ -1,699 +0,0 @@
-# Microsoft Developer Studio Project File - Name="iaxclient_dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=iaxclient_dll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "iaxclient_dll.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "iaxclient_dll.mak" CFG="iaxclient_dll - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "iaxclient_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "iaxclient_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "iaxclient_dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "_WINDLL" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /w /W0 /GX /I ".." /I "..\..\gsm\inc" /I "..\..\portaudio\include" /I "..\..\portaudio\src\common" /I "..\..\portaudio\pablio" /I "..\..\portmixer\px_common" /I "..\..\libspeex\include" /I "..\..\libiax2\src" /I "..\..\wince" /D "WIN32" /D "NDEBUG" /D "_USRDLL" /D "_WINDLL" /D "PA_NO_DS" /D "PA_NO_ASIO" /D SPEEX_PREPROCESS=1 /D "NEWJB" /D "LIBIAX" /D SPEEX_EC=1 /D inline=__inline /D strncasecmp=strnicmp /D vsnprintf=_vsnprintf /FD /c
-# SUBTRACT CPP /X /Fr /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"ReleaseDLL/iaxclient.dll"
-
-!ELSEIF "$(CFG)" == "iaxclient_dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "_WINDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /MDd /w /W0 /Gm /GX /Zi /Od /I ".." /I "..\..\gsm\inc" /I "..\..\portaudio\include" /I "..\..\portaudio\src\common" /I "..\..\portaudio\pablio" /I "..\..\portmixer\px_common" /I "..\..\libspeex\include" /I "..\..\libiax2\src" /I "..\..\wince" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_WINDLL" /D "BUILDING_DLL" /D "PA_NO_DS" /D "PA_NO_ASIO" /D SPEEX_PREPROCESS=1 /D "NEWJB" /D "LIBIAX" /D SPEEX_EC=1 /D inline=__inline /D strncasecmp=strnicmp /D vsnprintf=_vsnprintf /FD /GZ /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 msvcrt.lib wsock32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"DebugDLL/iaxclient.dll"
-
-!ENDIF
-
-# Begin Target
-
-# Name "iaxclient_dll - Win32 Release"
-# Name "iaxclient_dll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\audio_encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_portaudio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_alaw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_gsm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_speex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_ulaw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\iax.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\libiax2\src\iax2-parser.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\iaxclient_dll.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient_lib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\jitterbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\winfuncs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\audio_encode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_portaudio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_alaw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_gsm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_speex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_ulaw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\iax.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\libiax2\src\iax2-parser.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient_lib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\jitterbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\md5.h
-# End Source File
-# End Group
-# Begin Group "DSP"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\spandsp\plc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\spandsp\plc.h
-# End Source File
-# End Group
-# Begin Group "GSM"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\gsm\src\add.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\code.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\gsm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_create.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_destroy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_explode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_implode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_option.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_print.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\k6opt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\long_term.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\lpc.c
-
-!IF "$(CFG)" == "iaxclient_dll - Win32 Release"
-
-# PROP Intermediate_Dir "ReleaseDLL\gsm"
-
-!ELSEIF "$(CFG)" == "iaxclient_dll - Win32 Debug"
-
-# PROP Intermediate_Dir "DebugDLL\gsm"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\preprocess.c
-
-!IF "$(CFG)" == "iaxclient_dll - Win32 Release"
-
-# PROP Intermediate_Dir "ReleaseDLL\gsm"
-
-!ELSEIF "$(CFG)" == "iaxclient_dll - Win32 Debug"
-
-# PROP Intermediate_Dir "DebugDLL\gsm"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\private.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\proto.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\rpe.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\short_term.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\unproto.h
-# End Source File
-# End Group
-# Begin Group "PortAudio"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_allocation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_allocation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_converters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_converters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_cpuload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_cpuload.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_dither.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_dither.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_endianness.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_front.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_hostapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_process.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_skeleton.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_stream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_trace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_trace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\os\win\pa_win_hostapis.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\os\win\pa_win_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\pablio\ringbuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\pablio\ringbuffer.h
-# End Source File
-# End Group
-# Begin Group "PortMixer"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\portmixer\px_win_wmme\px_win_wmme.cpp
-# End Source File
-# End Group
-# Begin Group "Speex"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\libspeex\arch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\bits.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_10_16_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_10_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_20_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_5_256_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_5_64_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_8_128_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters_arm4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\fixed_debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\fixed_generic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\gain_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\gain_table_lbr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\hexc_10_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\hexc_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\high_lsp_tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\jitter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lbr_48k_tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lpc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lpc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp_tables_nb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\math_approx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\math_approx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\mdf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\medfilter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\medfilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\nb_celp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\nb_celp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\preprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\quant_lsp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\quant_lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\sb_celp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\sb_celp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\smallft.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\smallft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sox\sox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex_callbacks.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex_header.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stack_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stereo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.h
-# End Source File
-# End Group
-# End Target
-# End Project
Deleted: trunk/contrib/win/vc6/iaxclient_lib.dsp
===================================================================
--- trunk/contrib/win/vc6/iaxclient_lib.dsp 2007-11-22 00:15:53 UTC (rev 1281)
+++ trunk/contrib/win/vc6/iaxclient_lib.dsp 2007-11-25 12:31:48 UTC (rev 1282)
@@ -1,688 +0,0 @@
-# Microsoft Developer Studio Project File - Name="iaxclient_lib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=iaxclient_lib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "iaxclient_lib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "iaxclient_lib.mak" CFG="iaxclient_lib - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "iaxclient_lib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "iaxclient_lib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "iaxclient_lib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseLIB"
-# PROP Intermediate_Dir "ReleaseLIB"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /w /W0 /GX /I ".." /I "..\..\gsm\inc" /I "..\..\portaudio\include" /I "..\..\portaudio\src\common" /I "..\..\portaudio\pablio" /I "..\..\portmixer\px_common" /I "..\..\libspeex\include" /I "..\..\libiax2\src" /I "..\..\wince" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D SPEEX_PREPROCESS=1 /D "NEWJB" /D "LIBIAX" /D SPEEX_EC=1 /D inline=__inline /D strncasecmp=strnicmp /D vsnprintf=_vsnprintf /FD /c
-# SUBTRACT CPP /X /Fr /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"ReleaseLIB\iaxclient1.lib"
-
-!ELSEIF "$(CFG)" == "iaxclient_lib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugLIB"
-# PROP Intermediate_Dir "DebugLIB"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /MDd /w /W0 /Gm /GX /Zi /Od /I ".." /I "..\..\gsm\inc" /I "..\..\portaudio\include" /I "..\..\portaudio\src\common" /I "..\..\portaudio\pablio" /I "..\..\portmixer\px_common" /I "..\..\libspeex\include" /I "..\..\libiax2\src" /I "..\..\wince" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D SPEEX_PREPROCESS=1 /D "NEWJB" /D "LIBIAX" /D SPEEX_EC=1 /D inline=__inline /D strncasecmp=strnicmp /D vsnprintf=_vsnprintf /FD /GZ /c
-# SUBTRACT CPP /Fr /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"DebugLIB\iaxclient1.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "iaxclient_lib - Win32 Release"
-# Name "iaxclient_lib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\audio_encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_portaudio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_alaw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_gsm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_speex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_ulaw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\iax.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\libiax2\src\iax2-parser.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient_lib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\jitterbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\winfuncs.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\audio_encode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\audio_portaudio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_alaw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_gsm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_speex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\codec_ulaw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\iax.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\libiax2\src\iax2-parser.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\iaxclient_lib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\jitterbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libiax2\src\md5.h
-# End Source File
-# End Group
-# Begin Group "DSP"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\spandsp\plc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\spandsp\plc.h
-# End Source File
-# End Group
-# Begin Group "GSM"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\gsm\src\add.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\code.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\gsm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_create.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_destroy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_explode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_implode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_option.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\gsm_print.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\k6opt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\long_term.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\lpc.c
-
-!IF "$(CFG)" == "iaxclient_lib - Win32 Release"
-
-# PROP Intermediate_Dir "ReleaseLIB\gsm"
-
-!ELSEIF "$(CFG)" == "iaxclient_lib - Win32 Debug"
-
-# PROP Intermediate_Dir "DebugLIB\gsm"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\preprocess.c
-
-!IF "$(CFG)" == "iaxclient_lib - Win32 Release"
-
-# PROP Intermediate_Dir "ReleaseLIB\gsm"
-
-!ELSEIF "$(CFG)" == "iaxclient_lib - Win32 Debug"
-
-# PROP Intermediate_Dir "DebugLIB\gsm"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\private.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\proto.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\rpe.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\short_term.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\src\table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\gsm\inc\unproto.h
-# End Source File
-# End Group
-# Begin Group "PortAudio"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_allocation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_allocation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_converters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_converters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_cpuload.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_cpuload.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_dither.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_dither.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_endianness.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_front.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_hostapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_process.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_skeleton.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_stream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_trace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_trace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\common\pa_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\os\win\pa_win_hostapis.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\os\win\pa_win_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\pablio\ringbuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\portaudio\pablio\ringbuffer.h
-# End Source File
-# End Group
-# Begin Group "PortMixer"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\portmixer\px_win_wmme\px_win_wmme.cpp
-# End Source File
-# End Group
-# Begin Group "Speex"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\libspeex\arch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\bits.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\cb_search_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_10_16_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_10_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_20_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_5_256_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_5_64_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\exc_8_128_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters_arm4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filters_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\fixed_debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\fixed_generic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\gain_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\gain_table_lbr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\hexc_10_32_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\hexc_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\high_lsp_tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\jitter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lbr_48k_tables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lpc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lpc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lsp_tables_nb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\ltp_sse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\math_approx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\math_approx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\mdf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\medfilter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\medfilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\nb_celp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\nb_celp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\preprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\quant_lsp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\quant_lsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\sb_celp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\sb_celp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\smallft.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\smallft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sox\sox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex_callbacks.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\speex_header.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stack_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stereo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.h
-# End Source File
-# End Group
-# End Target
-# End Project
Deleted: trunk/contrib/win/vc6/iaxclient_lib.dsw
===================================================================
--- trunk/contrib/win/vc6/iaxclient_lib.dsw 2007-11-22 00:15:53 UTC (rev 1281)
+++ trunk/contrib/win/vc6/iaxclient_lib.dsw 2007-11-25 12:31:48 UTC (rev 1282)
@@ -1,59 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "all"=.\all.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name iaxclient_dll
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iaxclient_lib
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "iaxclient_dll"=.\iaxclient_dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "iaxclient_lib"=.\iaxclient_lib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
Added: trunk/contrib/win/vc6/libgsm.dsp
===================================================================
--- trunk/contrib/win/vc6/libgsm.dsp (rev 0)
+++ trunk/contrib/win/vc6/libgsm.dsp 2007-11-25 12:31:48 UTC (rev 1282)
@@ -0,0 +1,186 @@
+# Microsoft Developer Studio Project File - Name="libgsm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libgsm - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libgsm.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libgsm.mak" CFG="libgsm - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libgsm - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libgsm - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "Perforce Project"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libgsm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "i386rel"
+# PROP BASE Intermediate_Dir "i386rel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libgsm"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /w /W0 /GX /I "..\..\..\lib\gsm\inc" /D "WIN32" /D "NDEBUG" /D "_LIB" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libgsm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "i386dbg"
+# PROP BASE Intermediate_Dir "i386dbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\libgsm"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\gsm\inc" /D "WIN32" /D "_DEBUG" /D "_LIB" /Fr /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libgsm - Win32 Release"
+# Name "libgsm - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\add.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\code.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\debug.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\decode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_decode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_destroy.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_encode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_explode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_implode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_option.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\gsm_print.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\long_term.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\lpc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\preprocess.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\rpe.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\short_term.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\src\table.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\gsm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\private.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\proto.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\gsm\inc\unproto.h
+# End Source File
+# End Group
+# End Target
+# End Project
Added: trunk/contrib/win/vc6/libiax2.dsp
===================================================================
--- trunk/contrib/win/vc6/libiax2.dsp (rev 0)
+++ trunk/contrib/win/vc6/libiax2.dsp 2007-11-25 12:31:48 UTC (rev 1282)
@@ -0,0 +1,168 @@
+# Microsoft Developer Studio Project File - Name="libiax2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libiax2 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libiax2.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libiax2.mak" CFG="libiax2 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libiax2 - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libiax2 - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "libiax2"
+# PROP Scc_LocalPath "..\..\..\.."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libiax2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libiax2"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_LIB" /D "LIBIAX" /D "_CRT_SECURE_NO_DEPRECATE" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libiax2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\libiax2"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_LIB" /D "LIBIAX" /D "_CRT_SECURE_NO_DEPRECATE" /D NTDDI_VERSION=NTDDI_WIN2KSP4 /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libiax2 - Win32 Release"
+# Name "libiax2 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\iax.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\lib\libiax2\src\iax2-parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\jitterbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\md5.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\answer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\busy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\dialtone.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\frame.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\lib\libiax2\src\iax-client.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\iax.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\lib\libiax2\src\iax2-parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\iax2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\jitterbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\miniphone.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\options.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\ring10.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\ringtone.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\libiax2\src\winpoop.h
+# End Source File
+# End Group
+# End Target
+# End Project
Added: trunk/contrib/win/vc6/libiaxclient.dsp
===================================================================
--- trunk/contrib/win/vc6/libiaxclient.dsp (rev 0)
+++ trunk/contrib/win/vc6/libiaxclient.dsp 2007-11-25 12:31:48 UTC (rev 1282)
@@ -0,0 +1,178 @@
+# Microsoft Developer Studio Project File - Name="libiaxclient" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libiaxclient - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libiaxclient.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libiaxclient.mak" CFG="libiaxclient - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libiaxclient - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libiaxclient - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "Perforce Project"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libiaxclient - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "i386rel"
+# PROP BASE Intermediate_Dir "i386rel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libiaxclient"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /w /W0 /GX /I "..\..\..\lib\libiax2\src" /I "..\..\..\..\portaudio\include" /I "..\..\..\lib\spandsp" /I "..\..\..\lib\gsm\inc" /I "..\..\..\..\speex\include" /I "..\..\..\..\libogg\include" /I "..\..\..\lib\portmixer\px_common" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D "BUILDING_DLL" /D "LIBIAX" /D SPEEX_EC=1 /D "ALLOW_SMP_DANGERS" /D "_CRT_SECURE_NO_DEPRECATE" /D log10f=log10 /D vsnprintf=_vsnprintf /D strncasecmp=strnicmp /D __inline__=_inline /D inline=__inline /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libiaxclient - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "i386dbg"
+# PROP BASE Intermediate_Dir "i386dbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\libiaxclient"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\libiax2\src" /I "..\..\..\..\portaudio\include" /I "..\..\..\lib\spandsp" /I "..\..\..\lib\gsm\inc" /I "..\..\..\..\speex\include" /I "..\..\..\..\libogg\include" /I "..\..\..\lib\portmixer\px_common" /D "_DEBUG" /D "WIN32" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D "BUILDING_DLL" /D "LIBIAX" /D SPEEX_EC=1 /D "ALLOW_SMP_DANGERS" /D "_CRT_SECURE_NO_DEPRECATE" /D log10f=log10 /D vsnprintf=_vsnprintf /D strncasecmp=strnicmp /D __inline__=_inline /D inline=__inline /Fr /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libiaxclient - Win32 Release"
+# Name "libiaxclient - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\lib\audio_encode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\audio_portaudio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_alaw.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_gsm.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_speex.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_ulaw.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\iaxclient_lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\spandsp\plc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\ringbuffer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\winfuncs.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\lib\audio_alsa.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\audio_portaudio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_alaw.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_ffmpeg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_gsm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_ilbc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_speex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\codec_ulaw.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\iaxclient.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\iaxclient_lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\ringbuffer.h
+# End Source File
+# End Group
+# End Target
+# End Project
Added: trunk/contrib/win/vc6/libogg.dsp
===================================================================
--- trunk/contrib/win/vc6/libogg.dsp (rev 0)
+++ trunk/contrib/win/vc6/libogg.dsp 2007-11-25 12:31:48 UTC (rev 1282)
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="libogg" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libogg - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libogg.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libogg.mak" CFG="libogg - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libogg - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libogg - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "libogg"
+# PROP Scc_LocalPath "..\..\..\..\.."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libogg - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libogg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\libogg\include" /D "WIN32" /D "NDEBUG" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libogg - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\libogg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\libogg\include" /D "WIN32" /D "_DEBUG" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libogg - Win32 Release"
+# Name "libogg - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\libogg\src\bitwise.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\libogg\src\framing.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\libogg\include\ogg\ogg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\libogg\include\ogg\os_types.h
+# End Source File
+# End Group
+# End Target
+# End Project
Added: trunk/contrib/win/vc6/libportaudio.dsp
===================================================================
--- trunk/contrib/win/vc6/libportaudio.dsp (rev 0)
+++ trunk/contrib/win/vc6/libportaudio.dsp 2007-11-25 12:31:48 UTC (rev 1282)
@@ -0,0 +1,220 @@
+# Microsoft Developer Studio Project File - Name="libportaudio" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libportaudio - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libportaudio.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libportaudio.mak" CFG="libportaudio - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libportaudio - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libportaudio - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "libportaudio"
+# PROP Scc_LocalPath "..\..\..\..\.."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libportaudio - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\libportaudio"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\portaudio\include" /I "..\..\..\..\portaudio\src\common" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "PA_NO_DS" /D "PA_NO_ASIO" /D ALLOW_SMP_DANGERS=1 /D _CRT_SECURE_NO_WARNINGS=1 /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LI...
[truncated message content] |
|
From: <do...@us...> - 2007-11-22 00:15:48
|
Revision: 1281
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1281&view=rev
Author: dohpaz
Date: 2007-11-21 16:15:53 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Comment out diagnostic.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/lib/video.c
Modified: branches/team/elbunce/iaxclient/lib/video.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/video.c 2007-11-22 00:09:52 UTC (rev 1280)
+++ branches/team/elbunce/iaxclient/lib/video.c 2007-11-22 00:15:53 UTC (rev 1281)
@@ -973,7 +973,7 @@
!(prefs & IAXC_VIDEO_PREF_RECV_LOCAL_RAW) &&
!(prefs & IAXC_VIDEO_PREF_RECV_LOCAL_ENCODED)) )
{
- fprintf(stderr, "We SHOULD be STOPPING capture here! vinfo.capturing=%d\n", vinfo.capturing);
+/* fprintf(stderr, "We SHOULD be STOPPING capture here! vinfo.capturing=%d\n", vinfo.capturing); */
MUTEXLOCK(&vinfo.camera_lock);
if ( vinfo.capturing && vinfo.src &&
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <do...@us...> - 2007-11-22 00:09:47
|
Revision: 1280
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1280&view=rev
Author: dohpaz
Date: 2007-11-21 16:09:52 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Merge over fix from /branches/team/elbunce/iaxclient.
Make sure to stop/start the audio devices in pa when selecting new devices and
the audio isn't running. This fixes a bug where mixer level get/set would
operate on the previously selected devices (usually system default at startup)
instead of the devices people intend to set.
Modified Paths:
--------------
trunk/lib/audio_portaudio.c
Modified: trunk/lib/audio_portaudio.c
===================================================================
--- trunk/lib/audio_portaudio.c 2007-11-21 23:53:32 UTC (rev 1279)
+++ trunk/lib/audio_portaudio.c 2007-11-22 00:09:52 UTC (rev 1280)
@@ -941,9 +941,16 @@
selectedRing = ring;
if ( running )
{
+ /* stop/start audio, in order to switch devices */
pa_stop(d);
pa_start(d);
}
+ else
+ {
+ /* start/stop audio, in order to initialize mixers and levels */
+ pa_start(d);
+ pa_stop(d);
+ }
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <do...@us...> - 2007-11-21 23:53:35
|
Revision: 1279
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1279&view=rev
Author: dohpaz
Date: 2007-11-21 15:53:32 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Merge up to trunk of r1278.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/configure.ac
branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj
branches/team/elbunce/iaxclient/lib/audio_encode.c
branches/team/elbunce/iaxclient/lib/ringbuffer.c
Removed Paths:
-------------
branches/team/elbunce/iaxclient/contrib/win/vs2005/libvideolib.vcproj
Modified: branches/team/elbunce/iaxclient/configure.ac
===================================================================
--- branches/team/elbunce/iaxclient/configure.ac 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/configure.ac 2007-11-21 23:53:32 UTC (rev 1279)
@@ -392,8 +392,12 @@
# Autodetect clients
if test "x$enable_clients" = "xauto"; then
- clients="$clients testcall stresstest"
+ clients="$clients testcall"
+ if test x$has_oggz = xyes && test x$has_theora = xyes; then
+ clients="$clients stresstest"
+ fi
+
if test ! x$has_wx = xno; then
clients="$clients iaxphone"
if test "x$has_gdk2" = xyes; then
Modified: branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj 2007-11-21 23:53:32 UTC (rev 1279)
@@ -187,6 +187,26 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowObject.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowSource.cpp"
>
<FileConfiguration
@@ -283,6 +303,26 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\SourceStateMachine.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\vidcap.c"
>
</File>
@@ -305,6 +345,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowObject.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowSource.h"
>
</File>
@@ -321,18 +365,10 @@
>
</File>
<File
- RelativePath="..\..\..\..\libvidcap\src\directshow\LocklessQueue.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\libvidcap\src\logging.h"
>
</File>
<File
- RelativePath="..\..\..\..\libvidcap\src\logging.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\libvidcap\src\sapi.h"
>
</File>
@@ -345,6 +381,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\SourceStateMachine.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\include\vidcap\vidcap.h"
>
</File>
Deleted: branches/team/elbunce/iaxclient/contrib/win/vs2005/libvideolib.vcproj
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vs2005/libvideolib.vcproj 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/contrib/win/vs2005/libvideolib.vcproj 2007-11-21 23:53:32 UTC (rev 1279)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="libvideolib"
- ProjectGUID="{BE15A94D-3766-4693-ABA8-5FBAACBBCC08}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\lib\videoLib;..\..\..\lib;"$(PSDK_DIR)\Include";"$(PSDK_DIR)\Samples\Multimedia\DirectShow\BaseClasses";"$(DXSDK_DIR)\Include""
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4312"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="4"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\lib\videoLib;..\..\..\lib;"$(PSDK_DIR)\Include";"$(PSDK_DIR)\Samples\Multimedia\DirectShow\BaseClasses";"$(DXSDK_DIR)\Include""
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
- RuntimeLibrary="2"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DisableSpecificWarnings="4312"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </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="..\..\..\lib\videoLib\video_grab.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\videoLib\win32\wingrab.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </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>
Modified: branches/team/elbunce/iaxclient/lib/audio_encode.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/audio_encode.c 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/lib/audio_encode.c 2007-11-21 23:53:32 UTC (rev 1279)
@@ -94,7 +94,6 @@
static void set_speex_filters()
{
int i;
- float f;
if ( !st )
return;
@@ -107,10 +106,10 @@
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i);
/* make vad more sensitive */
- f = 0.30f;
- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &f);
- f = 0.07f;
- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &f);
+ i = 30;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &i);
+ i = 7;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &i);
}
static void calculate_level(short *audio, int len, float *level)
Modified: branches/team/elbunce/iaxclient/lib/ringbuffer.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/ringbuffer.c 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/lib/ringbuffer.c 2007-11-21 23:53:32 UTC (rev 1279)
@@ -100,7 +100,7 @@
#elif defined(__GNUC__)
/* GCC understands volatile asm and "memory" to mean it
* should not reorder memory read/writes */
-# if defined( __ppc__ )
+# if defined( __ppc__ ) || defined( __powerpc__ )
# define rb_FullMemoryBarrier() asm volatile("sync":::"memory")
# define rb_ReadMemoryBarrier() asm volatile("sync":::"memory")
# define rb_WriteMemoryBarrier() asm volatile("sync":::"memory")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <do...@us...> - 2007-11-21 23:46:10
|
Revision: 1278
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1278&view=rev
Author: dohpaz
Date: 2007-11-21 15:46:10 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Make sure to stop/start the audio devices in pa when selecting new devices and
the audio isn't running. This fixes a bug where mixer level get/set would
operate on the previously selected devices (usually system default at startup)
instead of the devices people intend to set.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/lib/audio_portaudio.c
Modified: branches/team/elbunce/iaxclient/lib/audio_portaudio.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/audio_portaudio.c 2007-11-21 22:41:30 UTC (rev 1277)
+++ branches/team/elbunce/iaxclient/lib/audio_portaudio.c 2007-11-21 23:46:10 UTC (rev 1278)
@@ -1042,9 +1042,16 @@
selectedRing = ring;
if ( running )
{
+ /* stop/start audio, in order to switch devices */
pa_stop(d);
pa_start(d);
}
+ else
+ {
+ /* start/stop audio, in order to initialize mixers and levels */
+ pa_start(d);
+ pa_stop(d);
+ }
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <do...@us...> - 2007-11-21 22:41:25
|
Revision: 1277
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1277&view=rev
Author: dohpaz
Date: 2007-11-21 14:41:30 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Remove meaningless message.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/lib/video.c
Modified: branches/team/elbunce/iaxclient/lib/video.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/video.c 2007-11-15 20:36:20 UTC (rev 1276)
+++ branches/team/elbunce/iaxclient/lib/video.c 2007-11-21 22:41:30 UTC (rev 1277)
@@ -650,8 +650,6 @@
if ( call->vformat == 0 )
{
- fprintf(stderr, "video format not set for call %d\n",
- selected_call);
return -1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2007-11-15 20:36:17
|
Revision: 1276
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1276&view=rev
Author: jpgrayson
Date: 2007-11-15 12:36:20 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Remove old libvideolib.vcproj file.
Add missing entries for files in libvidcap.vcproj.
Modified Paths:
--------------
trunk/contrib/win/vs2005/libvidcap.vcproj
Removed Paths:
-------------
trunk/contrib/win/vs2005/libvideolib.vcproj
Modified: trunk/contrib/win/vs2005/libvidcap.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libvidcap.vcproj 2007-11-08 14:54:07 UTC (rev 1275)
+++ trunk/contrib/win/vs2005/libvidcap.vcproj 2007-11-15 20:36:20 UTC (rev 1276)
@@ -187,6 +187,26 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowObject.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowSource.cpp"
>
<FileConfiguration
@@ -283,6 +303,26 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\SourceStateMachine.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\vidcap.c"
>
</File>
@@ -305,6 +345,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowObject.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowSource.h"
>
</File>
@@ -321,18 +365,10 @@
>
</File>
<File
- RelativePath="..\..\..\..\libvidcap\src\directshow\LocklessQueue.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\libvidcap\src\logging.h"
>
</File>
<File
- RelativePath="..\..\..\..\libvidcap\src\logging.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\libvidcap\src\sapi.h"
>
</File>
@@ -345,6 +381,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\SourceStateMachine.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\include\vidcap\vidcap.h"
>
</File>
Deleted: trunk/contrib/win/vs2005/libvideolib.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libvideolib.vcproj 2007-11-08 14:54:07 UTC (rev 1275)
+++ trunk/contrib/win/vs2005/libvideolib.vcproj 2007-11-15 20:36:20 UTC (rev 1276)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="libvideolib"
- ProjectGUID="{BE15A94D-3766-4693-ABA8-5FBAACBBCC08}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\lib\videoLib;..\..\..\lib;"$(PSDK_DIR)\Include";"$(PSDK_DIR)\Samples\Multimedia\DirectShow\BaseClasses";"$(DXSDK_DIR)\Include""
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4312"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="4"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\lib\videoLib;..\..\..\lib;"$(PSDK_DIR)\Include";"$(PSDK_DIR)\Samples\Multimedia\DirectShow\BaseClasses";"$(DXSDK_DIR)\Include""
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
- RuntimeLibrary="2"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DisableSpecificWarnings="4312"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </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="..\..\..\lib\videoLib\video_grab.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\videoLib\win32\wingrab.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2007-11-08 14:54:14
|
Revision: 1275
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1275&view=rev
Author: jpgrayson
Date: 2007-11-08 06:54:07 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
Patch from Mikael Magnusson (thank you!) to fix build issue on Debian GNU/Linux on powerpc.
Modified Paths:
--------------
trunk/lib/ringbuffer.c
Modified: trunk/lib/ringbuffer.c
===================================================================
--- trunk/lib/ringbuffer.c 2007-11-08 14:52:32 UTC (rev 1274)
+++ trunk/lib/ringbuffer.c 2007-11-08 14:54:07 UTC (rev 1275)
@@ -100,7 +100,7 @@
#elif defined(__GNUC__)
/* GCC understands volatile asm and "memory" to mean it
* should not reorder memory read/writes */
-# if defined( __ppc__ )
+# if defined( __ppc__ ) || defined( __powerpc__ )
# define rb_FullMemoryBarrier() asm volatile("sync":::"memory")
# define rb_ReadMemoryBarrier() asm volatile("sync":::"memory")
# define rb_WriteMemoryBarrier() asm volatile("sync":::"memory")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2007-11-08 14:52:37
|
Revision: 1274
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1274&view=rev
Author: jpgrayson
Date: 2007-11-08 06:52:32 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
When automatically choosing the clients at configure-time, only build stresstest if oggz and theora are available.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-11-07 18:00:18 UTC (rev 1273)
+++ trunk/configure.ac 2007-11-08 14:52:32 UTC (rev 1274)
@@ -385,8 +385,12 @@
# Autodetect clients
if test "x$enable_clients" = "xauto"; then
- clients="$clients testcall stresstest"
+ clients="$clients testcall"
+ if test x$has_oggz = xyes && test x$has_theora = xyes; then
+ clients="$clients stresstest"
+ fi
+
if test ! x$has_wx = xno; then
clients="$clients iaxphone"
if test "x$has_gdk2" = xyes; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2007-11-07 18:00:15
|
Revision: 1273
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1273&view=rev
Author: sbalea
Date: 2007-11-07 10:00:18 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Chane the minimum required version of speex to 1.1.12
Patch provided by Mikael Magnusson
Modified Paths:
--------------
branches/2.0/configure.ac
Modified: branches/2.0/configure.ac
===================================================================
--- branches/2.0/configure.ac 2007-11-07 15:52:35 UTC (rev 1272)
+++ branches/2.0/configure.ac 2007-11-07 18:00:18 UTC (rev 1273)
@@ -180,7 +180,7 @@
obtain a copy.
]))
-PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([
+PKG_CHECK_MODULES(SPEEX, [speex >= 1.1.12],,AC_MSG_ERROR([
speex is required to build this package!
please see http://www.xiph.org/ for how to
obtain a copy.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2007-11-07 15:52:38
|
Revision: 1272
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1272&view=rev
Author: sbalea
Date: 2007-11-07 07:52:35 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Merge VAD probabilities fix from trunk
Modified Paths:
--------------
branches/2.0/lib/audio_encode.c
Modified: branches/2.0/lib/audio_encode.c
===================================================================
--- branches/2.0/lib/audio_encode.c 2007-11-07 15:43:16 UTC (rev 1271)
+++ branches/2.0/lib/audio_encode.c 2007-11-07 15:52:35 UTC (rev 1272)
@@ -93,7 +93,6 @@
static void set_speex_filters()
{
int i;
- float f;
if(!st)
return;
@@ -106,10 +105,10 @@
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i);
/* make vad more sensitive */
- f = 0.30f;
- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &f);
- f = 0.07f;
- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &f);
+ i = 30;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &i);
+ i = 7;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &i);
}
static void calculate_level(short *audio, int len, float *level)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2007-11-07 15:43:18
|
Revision: 1271
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1271&view=rev
Author: sbalea
Date: 2007-11-07 07:43:16 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Speex changed its interface to VAD probabilities. In early 1.1 dev versions
VAD probabilities were floats. In 1.2beta1, the probabilities are 32 bit ints.
Iaxclient still passed pointers to floats as arguments, and this forced speex
to use its built in defaults. In effect our VAD probability tweaks did nothing.
This change attempts to fix this by converting VAD probability arguments to
32 bit integers ranging from 0 to 100.
Modified Paths:
--------------
trunk/lib/audio_encode.c
Modified: trunk/lib/audio_encode.c
===================================================================
--- trunk/lib/audio_encode.c 2007-11-06 18:29:21 UTC (rev 1270)
+++ trunk/lib/audio_encode.c 2007-11-07 15:43:16 UTC (rev 1271)
@@ -94,7 +94,6 @@
static void set_speex_filters()
{
int i;
- float f;
if ( !st )
return;
@@ -107,10 +106,10 @@
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i);
/* make vad more sensitive */
- f = 0.30f;
- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &f);
- f = 0.07f;
- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &f);
+ i = 30;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &i);
+ i = 7;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &i);
}
static void calculate_level(short *audio, int len, float *level)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2007-11-06 18:29:26
|
Revision: 1270
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1270&view=rev
Author: sbalea
Date: 2007-11-06 10:29:21 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
Update README.speex to reflect the fact that Mikael's patch was merged in.
Modified Paths:
--------------
branches/team/mihai/echocan/README.speex
Modified: branches/team/mihai/echocan/README.speex
===================================================================
--- branches/team/mihai/echocan/README.speex 2007-11-05 19:46:58 UTC (rev 1269)
+++ branches/team/mihai/echocan/README.speex 2007-11-06 18:29:21 UTC (rev 1270)
@@ -3,6 +3,3 @@
- a patched version of speex-1.2beta2. There are two patches included with
iaxclient that need to be applied (in any order).
- the latest development code, available via git from http://git.xiph.org/speex.git
-Currently, speex-1.2beta2-vad-probs.patch needs to be applied to this code.
-speex-1.2beta2-loudness.patch does not need to be applied since it was already
-merged in.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2007-11-05 19:48:31
|
Revision: 1269
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1269&view=rev
Author: sbalea
Date: 2007-11-05 11:46:58 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
Update the VAD probability setup code.
Speex changed the interface to this functionality, so our code no longer made
sense.
We also change the probability values: it appears that best result are obtained
when using speex default values. I am leaving the code in though, so we know
where and what to tweak in case we need to.
Modified Paths:
--------------
branches/team/mihai/echocan/lib/audio_encode.c
Modified: branches/team/mihai/echocan/lib/audio_encode.c
===================================================================
--- branches/team/mihai/echocan/lib/audio_encode.c 2007-11-05 19:42:15 UTC (rev 1268)
+++ branches/team/mihai/echocan/lib/audio_encode.c 2007-11-05 19:46:58 UTC (rev 1269)
@@ -109,7 +109,6 @@
static void set_speex_filters()
{
int i;
- //float f;
if ( !st )
return;
@@ -123,11 +122,15 @@
i = (iaxci_filters & IAXC_FILTER_DEREVERB) ? 1 : 0;
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB, &i);
- /* make vad more sensitive */
- //f = 0.30f;
- //speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &f);
- //f = 0.07f;
- //speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &f);
+ /*
+ * We can tweak these parameters to play with VAD sensitivity.
+ * For now, we use the default values since it seems they are a good starting point.
+ * However, if need be, this is the code that needs to change
+ */
+ i = 35;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &i);
+ i = 20;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &i);
}
static void calculate_level(short *audio, int len, float *level)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2007-11-05 19:42:15
|
Revision: 1268
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1268&view=rev
Author: sbalea
Date: 2007-11-05 11:42:15 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
Update speex patches and associated README.
Modified Paths:
--------------
branches/team/mihai/echocan/README.speex
Added Paths:
-----------
branches/team/mihai/echocan/speex-1.2beta2-loudness.patch
branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch
Removed Paths:
-------------
branches/team/mihai/echocan/speex-1.2beta2.patch
Modified: branches/team/mihai/echocan/README.speex
===================================================================
--- branches/team/mihai/echocan/README.speex 2007-11-05 18:46:22 UTC (rev 1267)
+++ branches/team/mihai/echocan/README.speex 2007-11-05 19:42:15 UTC (rev 1268)
@@ -1,4 +1,8 @@
Echo cancellation features depend on the very latest version of the speex codec.
To build this version of iaxclient you need one of the following:
-- a patched version of speex-1.2beta2. The patch is included as speex-1.2beta2.patch.
+- a patched version of speex-1.2beta2. There are two patches included with
+iaxclient that need to be applied (in any order).
- the latest development code, available via git from http://git.xiph.org/speex.git
+Currently, speex-1.2beta2-vad-probs.patch needs to be applied to this code.
+speex-1.2beta2-loudness.patch does not need to be applied since it was already
+merged in.
Copied: branches/team/mihai/echocan/speex-1.2beta2-loudness.patch (from rev 1267, branches/team/mihai/echocan/speex-1.2beta2.patch)
===================================================================
--- branches/team/mihai/echocan/speex-1.2beta2-loudness.patch (rev 0)
+++ branches/team/mihai/echocan/speex-1.2beta2-loudness.patch 2007-11-05 19:42:15 UTC (rev 1268)
@@ -0,0 +1,26 @@
+diff -urN speex-1.2beta2.orig/include/speex/speex_preprocess.h speex-1.2beta2/include/speex/speex_preprocess.h
+--- speex-1.2beta2.orig/include/speex/speex_preprocess.h 2007-01-23 06:59:04.000000000 -0500
++++ speex-1.2beta2/include/speex/speex_preprocess.h 2007-10-29 12:06:48.000000000 -0400
+@@ -178,6 +178,9 @@
+ /** Get maximal gain in dB (int32) */
+ #define SPEEX_PREPROCESS_GET_AGC_MAX_GAIN 31
+
++/** Get loudness */
++#define SPEEX_PREPROCESS_GET_AGC_LOUDNESS 32
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff -urN speex-1.2beta2.orig/libspeex/preprocess.c speex-1.2beta2/libspeex/preprocess.c
+--- speex-1.2beta2.orig/libspeex/preprocess.c 2007-05-03 05:22:04.000000000 -0400
++++ speex-1.2beta2/libspeex/preprocess.c 2007-10-29 13:35:53.000000000 -0400
+@@ -1163,6 +1163,9 @@
+ case SPEEX_PREPROCESS_GET_ECHO_STATE:
+ ptr = (void*)st->echo_state;
+ break;
++ case SPEEX_PREPROCESS_GET_AGC_LOUDNESS:
++ (*(spx_int32_t*)ptr) = pow(st->loudness, 1.0/LOUDNESS_EXP);
++ break;
+
+ default:
+ speex_warning_int("Unknown speex_preprocess_ctl request: ", request);
Added: branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch
===================================================================
--- branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch (rev 0)
+++ branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch 2007-11-05 19:42:15 UTC (rev 1268)
@@ -0,0 +1,24 @@
+diff -urN speex-1.2beta2.orig/libspeex/preprocess.c speex-1.2beta2/libspeex/preprocess.c
+--- speex-1.2beta2.orig/libspeex/preprocess.c 2007-05-03 05:22:04.000000000 -0400
++++ speex-1.2beta2/libspeex/preprocess.c 2007-11-05 14:34:37.000000000 -0500
+@@ -1124,16 +1124,16 @@
+ break;
+
+ case SPEEX_PREPROCESS_SET_PROB_START:
+- *(spx_int32_t*)ptr = MIN32(Q15_ONE,MAX32(0, *(spx_int32_t*)ptr));
+- st->speech_prob_start = DIV32_16(MULT16_16(32767,*(spx_int32_t*)ptr), 100);
++ *(spx_int32_t*)ptr = MIN32(100,MAX32(0, *(spx_int32_t*)ptr));
++ st->speech_prob_start = DIV32_16(MULT16_16(Q15ONE,*(spx_int32_t*)ptr), 100);
+ break;
+ case SPEEX_PREPROCESS_GET_PROB_START:
+ (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob_start, 100);
+ break;
+
+ case SPEEX_PREPROCESS_SET_PROB_CONTINUE:
+- *(spx_int32_t*)ptr = MIN32(Q15_ONE,MAX32(0, *(spx_int32_t*)ptr));
+- st->speech_prob_continue = DIV32_16(MULT16_16(32767,*(spx_int32_t*)ptr), 100);
++ *(spx_int32_t*)ptr = MIN32(100,MAX32(0, *(spx_int32_t*)ptr));
++ st->speech_prob_continue = DIV32_16(MULT16_16(Q15ONE,*(spx_int32_t*)ptr), 100);
+ break;
+ case SPEEX_PREPROCESS_GET_PROB_CONTINUE:
+ (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob_continue, 100);
Deleted: branches/team/mihai/echocan/speex-1.2beta2.patch
===================================================================
--- branches/team/mihai/echocan/speex-1.2beta2.patch 2007-11-05 18:46:22 UTC (rev 1267)
+++ branches/team/mihai/echocan/speex-1.2beta2.patch 2007-11-05 19:42:15 UTC (rev 1268)
@@ -1,26 +0,0 @@
-diff -urN speex-1.2beta2.orig/include/speex/speex_preprocess.h speex-1.2beta2/include/speex/speex_preprocess.h
---- speex-1.2beta2.orig/include/speex/speex_preprocess.h 2007-01-23 06:59:04.000000000 -0500
-+++ speex-1.2beta2/include/speex/speex_preprocess.h 2007-10-29 12:06:48.000000000 -0400
-@@ -178,6 +178,9 @@
- /** Get maximal gain in dB (int32) */
- #define SPEEX_PREPROCESS_GET_AGC_MAX_GAIN 31
-
-+/** Get loudness */
-+#define SPEEX_PREPROCESS_GET_AGC_LOUDNESS 32
-+
- #ifdef __cplusplus
- }
- #endif
-diff -urN speex-1.2beta2.orig/libspeex/preprocess.c speex-1.2beta2/libspeex/preprocess.c
---- speex-1.2beta2.orig/libspeex/preprocess.c 2007-05-03 05:22:04.000000000 -0400
-+++ speex-1.2beta2/libspeex/preprocess.c 2007-10-29 13:35:53.000000000 -0400
-@@ -1163,6 +1163,9 @@
- case SPEEX_PREPROCESS_GET_ECHO_STATE:
- ptr = (void*)st->echo_state;
- break;
-+ case SPEEX_PREPROCESS_GET_AGC_LOUDNESS:
-+ (*(spx_int32_t*)ptr) = pow(st->loudness, 1.0/LOUDNESS_EXP);
-+ break;
-
- default:
- speex_warning_int("Unknown speex_preprocess_ctl request: ", request);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2007-11-05 18:46:20
|
Revision: 1267
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1267&view=rev
Author: sbalea
Date: 2007-11-05 10:46:22 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
Make sure audio_lock is released when it should be.
Thanks Bill.
Modified Paths:
--------------
branches/team/mihai/echocan/lib/audio_encode.c
Modified: branches/team/mihai/echocan/lib/audio_encode.c
===================================================================
--- branches/team/mihai/echocan/lib/audio_encode.c 2007-11-05 15:29:12 UTC (rev 1266)
+++ branches/team/mihai/echocan/lib/audio_encode.c 2007-11-05 18:46:22 UTC (rev 1267)
@@ -453,7 +453,7 @@
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_ECHO_STATE, NULL);
}
}
-
+ MUTEXUNLOCK(&audio_lock);
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
11 messages has been excluded from this view by a project administrator.
