summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenri Herscher <henri@oreka.org>2006-01-24 16:24:14 +0000
committerHenri Herscher <henri@oreka.org>2006-01-24 16:24:14 +0000
commit1f9e4ca872a718619faed56acfdaff69b1237fa8 (patch)
tree56504ff26e42caa2fb5c0a168e7aca8b30d09b50
parent723b064a5c45cfce0270adb8443de584320a06e4 (diff)
Cleaned up comments
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@130 09dcff7a-b715-0410-9601-b79a96267cd0
-rw-r--r--orkaudio/filters/rtpmixer/RtpMixer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/orkaudio/filters/rtpmixer/RtpMixer.cpp b/orkaudio/filters/rtpmixer/RtpMixer.cpp
index 07c6921..0d02657 100644
--- a/orkaudio/filters/rtpmixer/RtpMixer.cpp
+++ b/orkaudio/filters/rtpmixer/RtpMixer.cpp
@@ -96,7 +96,7 @@ void RtpMixer::AudioChunkIn(AudioChunkRef& chunk)
throw (CStdString("RtpMixer input audio must be PCM !"));
}
- unsigned int rtpEndTimestamp = details->m_timestamp + chunk->GetNumSamples(); // GetNumSamples() #############################
+ unsigned int rtpEndTimestamp = details->m_timestamp + chunk->GetNumSamples();
if(m_writeTimestamp == 0)
{
@@ -186,7 +186,7 @@ void RtpMixer::StoreRtpPacket(AudioChunkRef& audioChunk)
AudioChunkDetails* details = audioChunk->GetDetails();
// 1. Silence from write pointer until end of RTP packet
- unsigned int endRtpTimestamp = details->m_timestamp + audioChunk->GetNumSamples(); // GetNumSamples() #############################
+ unsigned int endRtpTimestamp = details->m_timestamp + audioChunk->GetNumSamples();
if (endRtpTimestamp > m_writeTimestamp)
{
for(int i=0; i<(endRtpTimestamp - m_writeTimestamp); i++)
@@ -208,9 +208,9 @@ void RtpMixer::StoreRtpPacket(AudioChunkRef& audioChunk)
unsigned int timestampDelta = m_writeTimestamp - details->m_timestamp;
ASSERT(timestampDelta>=0);
short* tempWritePtr = CicularPointerSubtractOffset(m_writePtr, timestampDelta);
- short* payload = (short *)audioChunk->m_pBuffer; // payload should be short* #################################################
+ short* payload = (short *)audioChunk->m_pBuffer;
- for(int i=0; i<audioChunk->GetNumSamples() ; i++) //#################################################
+ for(int i=0; i<audioChunk->GetNumSamples() ; i++)
{
*tempWritePtr += payload[i];
tempWritePtr++;
@@ -219,7 +219,7 @@ void RtpMixer::StoreRtpPacket(AudioChunkRef& audioChunk)
tempWritePtr = m_buffer;
}
}
- debug.Format("Copied %d samples, tmpwr:%x", audioChunk->GetNumSamples(), tempWritePtr); //#################################################
+ debug.Format("Copied %d samples, tmpwr:%x", audioChunk->GetNumSamples(), tempWritePtr);
//LOG4CXX_DEBUG(m_log, debug);
}
@@ -345,7 +345,7 @@ unsigned int RtpMixer::FreeSpace()
extern "C"
{
- DLL_EXPORT void __CDECL__ Initialize()
+ DLL_EXPORT void __CDECL__ OrkInitialize()
{
FilterRef filter(new RtpMixer());
FilterRegistry::instance()->RegisterFilter(filter);