Commit 8dd32410 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Removing VA prefix in more outputs

parent 14627e79
......@@ -336,19 +336,19 @@ void CVAAmbisonicsFreeFieldAudioRenderer::Init(const CVAStruct& oArgs)
void CVAAmbisonicsFreeFieldAudioRenderer::Reset()
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Received reset call, indicating reset now");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Received reset call, indicating reset now");
ctxAudio.m_iResetFlag = 1; // Request reset
if (ctxAudio.m_iStatus == 0)
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Was not streaming, will reset manually");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Was not streaming, will reset manually");
// if no streaming active, reset manually
//SyncInternalData();
ResetInternalData();
}
else
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Still streaming, will now wait for reset acknownledge");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Still streaming, will now wait for reset acknownledge");
}
// Wait for last streaming block before internal reset
......@@ -357,7 +357,7 @@ void CVAAmbisonicsFreeFieldAudioRenderer::Reset()
VASleep(10); // Wait for acknowledge
}
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Operation reset has green light, clearing items");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Operation reset has green light, clearing items");
// Iterate over sound pathes and free items
std::list< CVAAFFSoundPath* >::iterator it = m_lSoundPaths.begin();
......@@ -406,7 +406,7 @@ void CVAAmbisonicsFreeFieldAudioRenderer::Reset()
ctxAudio.m_iResetFlag = 0; // Enter normal mode
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Reset successful");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Reset successful");
}
void CVAAmbisonicsFreeFieldAudioRenderer::UpdateScene(CVASceneState* pNewSceneState)
......@@ -635,14 +635,14 @@ void CVAAmbisonicsFreeFieldAudioRenderer::HandleProcessStream(ITADatasourceReali
// Check for reset request
if (ctxAudio.m_iResetFlag == 1)
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Process stream detecting reset request, will reset internally now");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Process stream detecting reset request, will reset internally now");
ResetInternalData();
return;
}
else if (ctxAudio.m_iResetFlag == 2)
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Process stream detecting ongoing reset, will stop processing here");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Process stream detecting ongoing reset, will stop processing here");
return;
}
......@@ -790,7 +790,7 @@ void CVAAmbisonicsFreeFieldAudioRenderer::UpdateTrajectories()
if (pMotionNew && (pMotionNew != pMotionCur))
{
VA_TRACE("VAAmbisonicsFreeFieldAudioRenderer", "Source " << iSourceID << " new motion state");
VA_TRACE("AmbisonicsFreeFieldAudioRenderer", "Source " << iSourceID << " new motion state");
pSource->pMotionModel->InputMotionKey(pMotionNew);
}
}
......@@ -809,7 +809,7 @@ void CVAAmbisonicsFreeFieldAudioRenderer::UpdateTrajectories()
if (pMotionNew && (pMotionNew != pMotionCur))
{
VA_TRACE("VAAmbisonicsFreeFieldAudioRenderer", "Listener " << iListenerID << " new position ");// << *pMotionNew);
VA_TRACE("AmbisonicsFreeFieldAudioRenderer", "Listener " << iListenerID << " new position ");// << *pMotionNew);
pListener->pMotionModel->InputMotionKey(pMotionNew);
}
}
......@@ -847,7 +847,7 @@ CVAAFFSoundPath* CVAAmbisonicsFreeFieldAudioRenderer::CreateSoundPath(CVAAFFSour
assert(!pSource->bDeleted && !pListener->bDeleted);
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Creating sound path from source " << iSourceID << " -> listener " << iListenerID);
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Creating sound path from source " << iSourceID << " -> listener " << iListenerID);
CVAAFFSoundPath* pPath = dynamic_cast<CVAAFFSoundPath*>(m_pSoundPathPool->RequestObject());
......@@ -872,7 +872,7 @@ CVAAFFSoundPath* CVAAmbisonicsFreeFieldAudioRenderer::CreateSoundPath(CVAAFFSour
void CVAAmbisonicsFreeFieldAudioRenderer::DeleteSoundPath(CVAAFFSoundPath* pPath)
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Marking sound path from source " << pPath->pSource->pData->iID << " -> listener " << pPath->pListener->pData->iID << " for deletion");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Marking sound path from source " << pPath->pSource->pData->iID << " -> listener " << pPath->pListener->pData->iID << " for deletion");
pPath->bDelete = true;
pPath->RemoveReference();
......@@ -881,7 +881,7 @@ void CVAAmbisonicsFreeFieldAudioRenderer::DeleteSoundPath(CVAAFFSoundPath* pPath
CVAAmbisonicsFreeFieldAudioRenderer::CVAAFFListener* CVAAmbisonicsFreeFieldAudioRenderer::CreateListener(const int iID, const CVAListenerState* pListenerState)
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Creating listener with ID " << iID);
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Creating listener with ID " << iID);
CVAAFFListener* pListener = dynamic_cast<CVAAFFListener*>(m_pListenerPool->RequestObject()); // Reference = 1
......@@ -909,7 +909,7 @@ CVAAmbisonicsFreeFieldAudioRenderer::CVAAFFListener* CVAAmbisonicsFreeFieldAudio
void CVAAmbisonicsFreeFieldAudioRenderer::DeleteListener(int iListenerID)
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Marking listener with ID " << iListenerID << " for removal");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Marking listener with ID " << iListenerID << " for removal");
std::map< int, CVAAFFListener* >::iterator it = m_mListeners.find(iListenerID);
CVAAFFListener* pListener = it->second;
m_mListeners.erase(it);
......@@ -924,7 +924,7 @@ void CVAAmbisonicsFreeFieldAudioRenderer::DeleteListener(int iListenerID)
CVAAmbisonicsFreeFieldAudioRenderer::CVAAFFSource* CVAAmbisonicsFreeFieldAudioRenderer::CreateSource(int iID, const CVASoundSourceState* pSourceState)
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Creating source with ID " << iID);
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Creating source with ID " << iID);
CVAAFFSource* pSource = dynamic_cast< CVAAFFSource* >(m_pSourcePool->RequestObject());
pSource->pData = m_pCore->GetSceneManager()->GetSoundSourceDesc(iID);
......@@ -945,7 +945,7 @@ CVAAmbisonicsFreeFieldAudioRenderer::CVAAFFSource* CVAAmbisonicsFreeFieldAudioRe
void CVAAmbisonicsFreeFieldAudioRenderer::DeleteSource(int iSourceID)
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Marking source with ID " << iSourceID << " for removal");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Marking source with ID " << iSourceID << " for removal");
std::map< int, CVAAFFSource* >::iterator it = m_mSources.find(iSourceID);
if (it == m_mSources.end()) // Not found in internal list ...
......@@ -1032,7 +1032,7 @@ void CVAAmbisonicsFreeFieldAudioRenderer::SyncInternalData()
void CVAAmbisonicsFreeFieldAudioRenderer::ResetInternalData()
{
VA_VERBOSE("VAAmbisonicsFreeFieldAudioRenderer", "Resetting internally");
VA_VERBOSE("AmbisonicsFreeFieldAudioRenderer", "Resetting internally");
std::list< CVAAFFSoundPath* >::const_iterator citp = ctxAudio.m_lSoundPaths.begin();
while (citp != ctxAudio.m_lSoundPaths.end())
......
......@@ -549,7 +549,7 @@ int CVARavenHybridScheduler::CallObject(const CVAStruct& oArgs, CVAStruct& oRetu
if (sCommand == "HELP") {
bValidCommand = true;
VA_PRINT("VAHybridScheduler: command switches: help, status, profiler");
VA_PRINT("HybridScheduler: command switches: help, status, profiler");
}
if (sCommand == "PROFILER") {
......
......@@ -417,7 +417,7 @@ int CVARavenRemoteScheduler::CallObject(const CVAStruct& oArgs, CVAStruct& oRetu
if (sCommand == "HELP") {
bValidCommand = true;
VA_INFO("VALocalRaven", "Command switches: help, status, profiler");
VA_INFO("LocalRaven", "Command switches: help, status, profiler");
}
if (sCommand == "PROFILER") {
......
......@@ -799,7 +799,7 @@ CVAMFFSoundPath* CVAMonauralFreeFieldAudioRenderer::CreateSoundPath( CVAMFFSourc
assert( !pSource->bDeleted && !pListener->bDeleted );
VA_VERBOSE("VAMonauralFreeFieldAudioRenderer", "Creating sound path from source " << iSourceID << " -> listener " << iListenerID);
VA_VERBOSE("MonauralFreeFieldAudioRenderer", "Creating sound path from source " << iSourceID << " -> listener " << iListenerID);
CVAMFFSoundPath* pPath = dynamic_cast<CVAMFFSoundPath*>( m_pSoundPathPool->RequestObject() );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment