*** empty log message ***

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@123 09dcff7a-b715-0410-9601-b79a96267cd0

3 files changed, 38 insertions, 94 deletions

diff --git a/orkaudio/OrkAudio.dsw b/orkaudio/OrkAudio.dsw
index 625b1df..9c693eb 100644
--- a/orkaudio/OrkAudio.dsw
+++ b/orkaudio/OrkAudio.dsw
@@ -39,7 +39,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "SoundDevice"=.\AudioCapturePlugins\SoundDevice\SoundDevice.dsp - Package Owner=<4>
+Project: "RtpMixer"=.\filters\rtpmixer\RtpMixer.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -51,7 +51,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "VoIp"=.\audiocaptureplugins\voip\VoIp.dsp - Package Owner=<4>
+Project: "SoundDevice"=.\AudioCapturePlugins\SoundDevice\SoundDevice.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -63,7 +63,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "VoIpMixer"=.\filters\VoIpMixer\VoIpMixer.dsp - Package Owner=<4>
+Project: "VoIp"=.\audiocaptureplugins\voip\VoIp.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/orkaudio/filters/VoIpMixer/VoIpMixer.cpp b/orkaudio/filters/rtpmixer/RtpMixer.cpp
index b2a7925..bbba476 100644
--- a/orkaudio/filters/VoIpMixer/VoIpMixer.cpp
+++ b/orkaudio/filters/rtpmixer/RtpMixer.cpp
@@ -36,10 +36,10 @@ extern "C"
 #define NUM_SAMPLES_SHIPMENT_HOLDOFF 2000	// when shipping, ship everything but this number of samples 
 
 
-class VoIpMixer : public Filter
+class RtpMixer : public Filter
 {
 public:
-	VoIpMixer();
+	RtpMixer();
 
 	FilterRef __CDECL__ Instanciate();
 	void __CDECL__ AudioChunkIn(AudioChunkRef& chunk);
@@ -71,7 +71,7 @@ private:
 
 };
 
-VoIpMixer::VoIpMixer()
+RtpMixer::RtpMixer()
 {
 	m_writePtr = m_buffer;
 	m_readPtr = m_buffer;
@@ -82,18 +82,18 @@ VoIpMixer::VoIpMixer()
 	m_shippedSamples = 0;
 }
 
-FilterRef VoIpMixer::Instanciate()
+FilterRef RtpMixer::Instanciate()
 {
-	FilterRef Filter(new VoIpMixer());
+	FilterRef Filter(new RtpMixer());
 	return Filter;
 }
 
-void VoIpMixer::AudioChunkIn(AudioChunkRef& chunk)
+void RtpMixer::AudioChunkIn(AudioChunkRef& chunk)
 {	
 	AudioChunkDetails* details = chunk->GetDetails();		
 	if(details->m_encoding != PcmAudio)
 	{
-		throw (CStdString("VoIpMixer input audio must be PCM !"));
+		throw (CStdString("RtpMixer input audio must be PCM !"));
 	}
 
 	unsigned int rtpEndTimestamp = details->m_timestamp + chunk->GetNumSamples();  // GetNumSamples()  #############################
@@ -145,7 +145,7 @@ void VoIpMixer::AudioChunkIn(AudioChunkRef& chunk)
 	//LOG4CXX_DEBUG(m_log, debug);
 }
 
-void VoIpMixer::AudioChunkOut(AudioChunkRef& chunk)
+void RtpMixer::AudioChunkOut(AudioChunkRef& chunk)
 {
 	if(m_outputQueue.size() > 0)
 	{
@@ -158,29 +158,29 @@ void VoIpMixer::AudioChunkOut(AudioChunkRef& chunk)
 	}
 }
 
-AudioEncodingEnum VoIpMixer::GetInputAudioEncoding()
+AudioEncodingEnum RtpMixer::GetInputAudioEncoding()
 {
 	return PcmAudio;
 }
 
-AudioEncodingEnum VoIpMixer::GetOutputAudioEncoding()
+AudioEncodingEnum RtpMixer::GetOutputAudioEncoding()
 {
 	return PcmAudio;
 }
 
-CStdString VoIpMixer::GetName()
+CStdString RtpMixer::GetName()
 {
-	return "VoIpMixer";
+	return "RtpMixer";
 }
 
 
-int VoIpMixer::GetInputRtpPayloadType(void)	// does not link if not defined here ?
+int RtpMixer::GetInputRtpPayloadType(void)	// does not link if not defined here ?
 {
 	return -1;
 }
 
 // Writes to the internal buffer without any size verification
-void VoIpMixer::StoreRtpPacket(AudioChunkRef& audioChunk)
+void RtpMixer::StoreRtpPacket(AudioChunkRef& audioChunk)
 {
 	CStdString debug;
 	AudioChunkDetails* details = audioChunk->GetDetails();
@@ -223,7 +223,7 @@ void VoIpMixer::StoreRtpPacket(AudioChunkRef& audioChunk)
 	//LOG4CXX_DEBUG(m_log, debug);
 }
 
-short* VoIpMixer::CircularPointerAddOffset(short *ptr, size_t offset)
+short* RtpMixer::CircularPointerAddOffset(short *ptr, size_t offset)
 {
 	if((ptr + offset) >= m_bufferEnd)
 	{
@@ -235,7 +235,7 @@ short* VoIpMixer::CircularPointerAddOffset(short *ptr, size_t offset)
 	}
 }
 
-short* VoIpMixer::CicularPointerSubtractOffset(short *ptr, size_t offset)
+short* RtpMixer::CicularPointerSubtractOffset(short *ptr, size_t offset)
 {
 	if((ptr-offset) < m_buffer)
 	{
@@ -247,7 +247,7 @@ short* VoIpMixer::CicularPointerSubtractOffset(short *ptr, size_t offset)
 	}
 }
 
-void VoIpMixer::CreateShipment(size_t silenceSize)
+void RtpMixer::CreateShipment(size_t silenceSize)
 {
 	// 1. ship from readPtr until stop pointer or until end of buffer if wrapped
 	bool bufferWrapped = false;
@@ -324,7 +324,7 @@ void VoIpMixer::CreateShipment(size_t silenceSize)
 }
 
 
-unsigned int VoIpMixer::UsedSpace()
+unsigned int RtpMixer::UsedSpace()
 {
 	if(m_writePtr >= m_readPtr)
 	{
@@ -334,7 +334,7 @@ unsigned int VoIpMixer::UsedSpace()
 }
 
 
-unsigned int VoIpMixer::FreeSpace()
+unsigned int RtpMixer::FreeSpace()
 {
 	return NUM_SAMPLES_CIRCULAR_BUFFER - UsedSpace();
 }
@@ -347,7 +347,7 @@ extern "C"
 {
 	DLL_EXPORT void __CDECL__ Initialize()
 	{
-		FilterRef filter(new VoIpMixer());
+		FilterRef filter(new RtpMixer());
 		FilterRegistry::instance()->RegisterFilter(filter);
 	}
 }
\ No newline at end of file
diff --git a/orkaudio/filters/VoIpMixer/VoIpMixer.dsp b/orkaudio/filters/rtpmixer/RtpMixer.dsp
index 2d43dd8..3784a41 100644
--- a/orkaudio/filters/VoIpMixer/VoIpMixer.dsp
+++ b/orkaudio/filters/rtpmixer/RtpMixer.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="VoIpMixer" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="RtpMixer" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=VoIpMixer - Win32 Debug
+CFG=RtpMixer - 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 "VoIpMixer.mak".
+!MESSAGE NMAKE /f "RtpMixer.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 "VoIpMixer.mak" CFG="VoIpMixer - Win32 Debug"
+!MESSAGE NMAKE /f "RtpMixer.mak" CFG="RtpMixer - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "VoIpMixer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "VoIpMixer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RtpMixer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "RtpMixer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "VoIpMixer - Win32 Release"
+!IF  "$(CFG)" == "RtpMixer - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,8 +41,8 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VoIpMixer_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\devExt\winpcap\WpdPack\Include" /I "../.." /I "../../../OrkBaseCxx" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "../Common" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VoIpMixer_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RtpMixer_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\devExt\winpcap\WpdPack\Include" /I "../.." /I "../../../OrkBaseCxx" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "../Common" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RtpMixer_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,7 +54,7 @@ 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 packet.lib wpcap.lib wininet.lib OrkBase.lib ace.lib log4cxx.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 /libpath:"C:\devExt\winpcap\WpdPack\Lib" /libpath:"../../../OrkBaseCxx/Release" /libpath:"C:\devExt\log4cxx\log4cxx-0.9.7\msvc\Lib\Release" /libpath:"C:\devExt\ACE_wrappers\lib"
 
-!ELSEIF  "$(CFG)" == "VoIpMixer - Win32 Debug"
+!ELSEIF  "$(CFG)" == "RtpMixer - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -67,8 +67,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VoIpMixer_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "C:\devExt\winpcap\WpdPack\Include" /I "../.." /I "../../../OrkBaseCxx" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "../Common" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VoIpMixer_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RtpMixer_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "C:\devExt\winpcap\WpdPack\Include" /I "../.." /I "../../../OrkBaseCxx" /I "C:\devExt\boost\boost_1_32_0" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "../Common" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RtpMixer_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -84,70 +84,14 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "VoIpMixer - Win32 Release"
-# Name "VoIpMixer - Win32 Debug"
+# Name "RtpMixer - Win32 Release"
+# Name "RtpMixer - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\AudioCapturePlugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\AudioCapturePluginCommon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\AudioCapturePluginCommon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\ConfigManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\g711.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\g711.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\PacketHeaderDefs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PacketHeaderDefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Rtp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Rtp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\RtpSession.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RtpSession.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\VoIpMixer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\VoIpMixerConfig.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\VoIpMixerConfig.h
+SOURCE=.\RtpMixer.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"