Added SDP negotiator and changed SDP structs (tested)

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@129 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 68 insertions, 2 deletions

diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp
index c8f464b1..3f62d5ad 100644
--- a/pjmedia/build/pjmedia.dsp
+++ b/pjmedia/build/pjmedia.dsp
@@ -96,6 +96,10 @@ SOURCE=..\src\pjmedia\dsound.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\pjmedia\errno.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\pjmedia\g711.c

 # End Source File

 # Begin Source File

@@ -129,7 +133,24 @@ SOURCE=..\src\pjmedia\sdp.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\pjmedia\sdp_cmp.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\src\pjmedia\sdp_neg.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\pjmedia\session.c

+

+!IF  "$(CFG)" == "pjmedia - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "pjmedia - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -149,6 +170,10 @@ SOURCE=..\include\pjmedia\config.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\include\pjmedia\errno.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\include\pjmedia\jbuf.h

 # End Source File

 # Begin Source File

@@ -173,6 +198,10 @@ SOURCE=..\include\pjmedia\sdp.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\include\pjmedia\sdp_neg.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\include\pjmedia\session.h

 # End Source File

 # Begin Source File

@@ -183,6 +212,10 @@ SOURCE=..\include\pjmedia\sound.h
 

 SOURCE=..\include\pjmedia\stream.h

 # End Source File

+# Begin Source File

+

+SOURCE=..\include\pjmedia\types.h

+# End Source File

 # End Group

 # Begin Group "PortAudio"

 

diff --git a/pjmedia/build/pjmedia.dsw b/pjmedia/build/pjmedia.dsw
index 9b01973b..b51b3ce3 100644
--- a/pjmedia/build/pjmedia.dsw
+++ b/pjmedia/build/pjmedia.dsw
@@ -77,6 +77,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name pjsdp

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name pjlib_util

+    End Project Dependency

 }}}

 

 ###############################################################################

diff --git a/pjmedia/build/pjmedia_test.dsp b/pjmedia/build/pjmedia_test.dsp
index ec3d4afe..eb073323 100644
--- a/pjmedia/build/pjmedia_test.dsp
+++ b/pjmedia/build/pjmedia_test.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../pjlib/include" /I "../include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../pjlib/include" /I "../include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -99,16 +99,46 @@ SOURCE=..\src\test\rtp_test.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\test\sdp_neg_test.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\test\sdptest.c

+

+!IF  "$(CFG)" == "pjmedia_test - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "pjmedia_test - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=..\src\test\session_test.c

+

+!IF  "$(CFG)" == "pjmedia_test - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "pjmedia_test - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\src\test\test.c

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=..\src\test\test.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"