[adsp] improve for loops in CActiveAEDSPProcess, CActiveAEDSPAddonand and CActiveAEDS...

diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.cpp b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.cpp
index 7656616..0a40578 100644 (file)
--- a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.cpp
+++ b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.cpp
@@ -374,7 +374,7 @@ bool CActiveAEDSPAddon::HaveMenuHooks(AE_DSP_MENUHOOK_CAT cat) const
 {
   if (m_bReadyToUse && m_menuhooks.size() > 0)
   {
-    for (unsigned int i = 0; i < m_menuhooks.size(); i++)
+    for (unsigned int i = 0; i < m_menuhooks.size(); ++i)
     {
       if (m_menuhooks[i].category == cat || m_menuhooks[i].category == AE_DSP_MENUHOOK_ALL)
         return true;

diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPDatabase.cpp b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPDatabase.cpp
index 2925ef7..587e884 100644 (file)
--- a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPDatabase.cpp
+++ b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPDatabase.cpp
@@ -94,7 +94,7 @@ void CActiveAEDSPDatabase::CreateTables()
     CLog::Log(LOGERROR, "Audio DSP - %s - failed to get add-ons from the add-on manager", __FUNCTION__);
   else
   {
-    for (IVECADDONS it = addons.begin(); it != addons.end(); it++)
+    for (IVECADDONS it = addons.begin(); it != addons.end(); ++it)
       CAddonMgr::GetInstance().DisableAddon(it->get()->ID());
   }
 }
@@ -175,7 +175,7 @@ bool CActiveAEDSPDatabase::PersistModes(std::vector<CActiveAEDSPModePtr> &modes,
 {
   bool bReturn(true);
 
-  for (unsigned int iModePtr = 0; iModePtr < modes.size(); iModePtr++)
+  for (unsigned int iModePtr = 0; iModePtr < modes.size(); ++iModePtr)
   {
     CActiveAEDSPModePtr member = modes.at(iModePtr);
     if (!member->IsInternal() && (member->IsChanged() || member->IsNew()))

diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPProcess.cpp b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPProcess.cpp
index eaa4b50..fb6a884 100644 (file)
--- a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPProcess.cpp
+++ b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSPProcess.cpp
@@ -61,7 +61,7 @@ CActiveAEDSPProcess::CActiveAEDSPProcess(AE_DSP_STREAM_ID streamId)
    * If a bigger size is neeeded it becomes reallocated during DSP processing.
    */
   m_processArraySize = MIN_DSP_ARRAY_SIZE;
-  for (int i = 0; i < AE_DSP_CH_MAX; i++)
+  for (int i = 0; i < AE_DSP_CH_MAX; ++i)
   {
     m_processArray[0][i] = (float*)calloc(m_processArraySize, sizeof(float));
     m_processArray[1][i] = (float*)calloc(m_processArraySize, sizeof(float));
@@ -79,7 +79,7 @@ CActiveAEDSPProcess::~CActiveAEDSPProcess()
   }
 
   /* Clear the buffer arrays */
-  for (int i = 0; i < AE_DSP_CH_MAX; i++)
+  for (int i = 0; i < AE_DSP_CH_MAX; ++i)
   {
     if(m_processArray[0][i])
       free(m_processArray[0][i]);
@@ -316,7 +316,7 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio
     const AE_DSP_MODELIST listInputResample = CActiveAEDSP::GetInstance().GetAvailableModes(AE_DSP_MODE_TYPE_INPUT_RESAMPLE);
     if (listInputResample.size() == 0)
       CLog::Log(LOGDEBUG, "  | - no input resample addon present or enabled");
-    for (unsigned int i = 0; i < listInputResample.size(); i++)
+    for (unsigned int i = 0; i < listInputResample.size(); ++i)
     {
       /// For resample only one call is allowed. Use first one and ignore everything else.
       CActiveAEDSPModePtr pMode = listInputResample[i].first;
@@ -369,7 +369,7 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio
     /*!
      * Now init all other dsp relavant addons
      */
-    for (AE_DSP_ADDONMAP_ITR itr = addonMap.begin(); itr != addonMap.end(); itr++)
+    for (AE_DSP_ADDONMAP_ITR itr = addonMap.begin(); itr != addonMap.end(); ++itr)
     {
       AE_DSP_ADDON addon = itr->second;
       int id = addon->GetID();
@@ -389,7 +389,7 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio
       }
     }
 
-    for (AE_DSP_ADDONMAP_ITR itr = m_usedMap.begin(); itr != m_usedMap.end(); itr++)
+    for (AE_DSP_ADDONMAP_ITR itr = m_usedMap.begin(); itr != m_usedMap.end(); ++itr)
     {
       AE_DSP_ADDON addon = itr->second;
       if (addon->SupportsInputInfoProcess())
@@ -406,11 +406,11 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio
      */
     CLog::Log(LOGDEBUG, "  ---- DSP active pre process modes ---");
     const AE_DSP_MODELIST listPreProcess = CActiveAEDSP::GetInstance().GetAvailableModes(AE_DSP_MODE_TYPE_PRE_PROCESS);
-    for (unsigned int i = 0; i < listPreProcess.size(); i++)
+    for (unsigned int i = 0; i < listPreProcess.size(); ++i)
     {
       CActiveAEDSPModePtr pMode = listPreProcess[i].first;
       AE_DSP_ADDON        addon = listPreProcess[i].second;
-      int                   id  = addon->GetID();
+      int                    id = addon->GetID();
 
       if (m_usedMap.find(id) == m_usedMap.end())
         continue;
@@ -436,7 +436,7 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio
      */
     CLog::Log(LOGDEBUG, "  ---- DSP active master process modes ---");
     const AE_DSP_MODELIST listMasterProcess = CActiveAEDSP::GetInstance().GetAvailableModes(AE_DSP_MODE_TYPE_MASTER_PROCESS);
-    for (unsigned int i = 0; i < listMasterProcess.size(); i++)
+    for (unsigned int i = 0; i < listMasterProcess.size(); ++i)
     {
       CActiveAEDSPModePtr pMode = listMasterProcess[i].first;
       AE_DSP_ADDON        addon = listMasterProcess[i].second;
@@ -469,7 +469,7 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio
     if (modeID == AE_DSP_MASTER_MODE_ID_INVALID)
       modeID = AE_DSP_MASTER_MODE_ID_PASSOVER;
 
-    for (unsigned int ptr = 0; ptr < m_addons_MasterProc.size(); ptr++)
+    for (unsigned int ptr = 0; ptr < m_addons_MasterProc.size(); ++ptr)
     {
       CActiveAEDSPModePtr mode = m_addons_MasterProc.at(ptr).pMode;
       if (mode->ModeID() == modeID)
@@ -510,7 +510,7 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio
      */
     CLog::Log(LOGDEBUG, "  ---- DSP active post process modes ---");
     const AE_DSP_MODELIST listPostProcess = CActiveAEDSP::GetInstance().GetAvailableModes(AE_DSP_MODE_TYPE_POST_PROCESS);
-    for (unsigned int i = 0; i < listPostProcess.size(); i++)
+    for (unsigned int i = 0; i < listPostProcess.size(); ++i)
     {
       CActiveAEDSPModePtr pMode = listPostProcess[i].first;
       AE_DSP_ADDON        addon = listPostProcess[i].second;
@@ -545,7 +545,7 @@ bool CActiveAEDSPProcess::Create(const AEAudioFormat &inputFormat, const AEAudio
       const AE_DSP_MODELIST listOutputResample = CActiveAEDSP::GetInstance().GetAvailableModes(AE_DSP_MODE_TYPE_OUTPUT_RESAMPLE);
       if (listOutputResample.size() == 0)
         CLog::Log(LOGDEBUG, "  | - no final post resample addon present or enabled, becomes performed by KODI");
-      for (unsigned int i = 0; i < listOutputResample.size(); i++)
+      for (unsigned int i = 0; i < listOutputResample.size(); ++i)
       {
         /// For resample only one call is allowed. Use first one and ignore everything else.
         CActiveAEDSPModePtr pMode = listOutputResample[i].first;
@@ -822,7 +822,7 @@ void CActiveAEDSPProcess::Destroy()
   if (!CActiveAEDSP::GetInstance().IsActivated())
     return;
 
-  for (AE_DSP_ADDONMAP_ITR itr = m_usedMap.begin(); itr != m_usedMap.end(); itr++)
+  for (AE_DSP_ADDONMAP_ITR itr = m_usedMap.begin(); itr != m_usedMap.end(); ++itr)
   {
     itr->second->StreamDestroy(&m_addon_Handles[itr->first]);
   }
@@ -1051,7 +1051,7 @@ bool CActiveAEDSPProcess::MasterModeChange(int iModeID, AE_DSP_STREAMTYPE iStrea
   else
   {
     CActiveAEDSPModePtr mode;
-    for (unsigned int ptr = 0; ptr < m_addons_MasterProc.size(); ptr++)
+    for (unsigned int ptr = 0; ptr < m_addons_MasterProc.size(); ++ptr)
     {
       mode = m_addons_MasterProc.at(ptr).pMode;
       if (mode->ModeID() == iModeID && mode->IsEnabled())
@@ -1105,7 +1105,7 @@ bool CActiveAEDSPProcess::MasterModeChange(int iModeID, AE_DSP_STREAMTYPE iStrea
 void CActiveAEDSPProcess::ClearArray(float **array, unsigned int samples)
 {
   unsigned int presentFlag = 1;
-  for (int i = 0; i < AE_DSP_CH_MAX; i++)
+  for (int i = 0; i < AE_DSP_CH_MAX; ++i)
   {
     if (m_addonSettings.lOutChannelPresentFlags & presentFlag)
       memset(array[i], 0, samples*sizeof(float));
@@ -1232,7 +1232,7 @@ bool CActiveAEDSPProcess::Process(CSampleBuffer *in, CSampleBuffer *out)
       m_NewStreamType = AE_DSP_ASTREAM_INVALID;
     }
 
-    for (AE_DSP_ADDONMAP_ITR itr = m_usedMap.begin(); itr != m_usedMap.end(); itr++)
+    for (AE_DSP_ADDONMAP_ITR itr = m_usedMap.begin(); itr != m_usedMap.end(); ++itr)
     {
       AE_DSP_ERROR err = itr->second->StreamInitialize(&m_addon_Handles[itr->first], &m_addonSettings);
       if (err != AE_DSP_ERROR_NO_ERROR)
@@ -1278,7 +1278,7 @@ bool CActiveAEDSPProcess::Process(CSampleBuffer *in, CSampleBuffer *out)
    * Can be used to have unchanged input stream..
    * All DSP addons allowed todo this.
    */
-  for (unsigned int i = 0; i < m_addons_InputProc.size(); i++)
+  for (unsigned int i = 0; i < m_addons_InputProc.size(); ++i)
   {
     if (!m_addons_InputProc[i].pAddon->InputProcess(&m_addons_InputProc[i].handle, (const float **)lastOutArray, frames))
     {
@@ -1310,7 +1310,7 @@ bool CActiveAEDSPProcess::Process(CSampleBuffer *in, CSampleBuffer *out)
    * DSP pre processing
    * All DSP addons allowed todo this and order of it set on settings.
    */
-  for (unsigned int i = 0; i < m_addons_PreProc.size(); i++)
+  for (unsigned int i = 0; i < m_addons_PreProc.size(); ++i)
   {
     startTime = CurrentHostCounter();
 
@@ -1374,7 +1374,7 @@ bool CActiveAEDSPProcess::Process(CSampleBuffer *in, CSampleBuffer *out)
    * or frequency/volume corrections, speaker distance handling, equalizer... .
    * All DSP addons allowed todo this and order of it set on settings.
    */
-  for (unsigned int i = 0; i < m_addons_PostProc.size(); i++)
+  for (unsigned int i = 0; i < m_addons_PostProc.size(); ++i)
   {
     startTime = CurrentHostCounter();
 
@@ -1448,7 +1448,7 @@ bool CActiveAEDSPProcess::RecheckProcessArray(unsigned int inputFrames)
       framesOut = framesNeeded;
   }
 
-  for (unsigned int i = 0; i < m_addons_PreProc.size(); i++)
+  for (unsigned int i = 0; i < m_addons_PreProc.size(); ++i)
   {
     framesNeeded = m_addons_PreProc[i].pAddon->PreProcessNeededSamplesize(&m_addons_PreProc[i].handle, m_addons_PreProc[i].iAddonModeNumber);
     if (framesNeeded > framesOut)
@@ -1462,7 +1462,7 @@ bool CActiveAEDSPProcess::RecheckProcessArray(unsigned int inputFrames)
       framesOut = framesNeeded;
   }
 
-  for (unsigned int i = 0; i < m_addons_PostProc.size(); i++)
+  for (unsigned int i = 0; i < m_addons_PostProc.size(); ++i)
   {
     framesNeeded = m_addons_PostProc[i].pAddon->PostProcessNeededSamplesize(&m_addons_PostProc[i].handle, m_addons_PostProc[i].iAddonModeNumber);
     if (framesNeeded > framesOut)
@@ -1489,7 +1489,7 @@ bool CActiveAEDSPProcess::RecheckProcessArray(unsigned int inputFrames)
 bool CActiveAEDSPProcess::ReallocProcessArray(unsigned int requestSize)
 {
   m_processArraySize = requestSize + MIN_DSP_ARRAY_SIZE / 10;
-  for (int i = 0; i < AE_DSP_CH_MAX; i++)
+  for (int i = 0; i < AE_DSP_CH_MAX; ++i)
   {
     m_processArray[0][i] = (float*)realloc(m_processArray[0][i], m_processArraySize*sizeof(float));
     m_processArray[1][i] = (float*)realloc(m_processArray[1][i], m_processArraySize*sizeof(float));
@@ -1523,7 +1523,7 @@ void CActiveAEDSPProcess::CalculateCPUUsage(unsigned int iTime)
       m_addon_InputResample.iLastTime = 0;
     }
 
-    for (unsigned int i = 0; i < m_addons_PreProc.size(); i++)
+    for (unsigned int i = 0; i < m_addons_PreProc.size(); ++i)
     {
       m_addons_PreProc[i].pMode->SetCPUUsage((float)(m_addons_PreProc[i].iLastTime)*dTFactor);
       m_addons_PreProc[i].iLastTime = 0;
@@ -1535,7 +1535,7 @@ void CActiveAEDSPProcess::CalculateCPUUsage(unsigned int iTime)
       m_addons_MasterProc[m_activeMode].iLastTime = 0;
     }
 
-    for (unsigned int i = 0; i < m_addons_PostProc.size(); i++)
+    for (unsigned int i = 0; i < m_addons_PostProc.size(); ++i)
     {
       m_addons_PostProc[i].pMode->SetCPUUsage((float)(m_addons_PostProc[i].iLastTime)*dTFactor);
       m_addons_PostProc[i].iLastTime = 0;
@@ -1691,13 +1691,13 @@ float CActiveAEDSPProcess::GetDelay()
   if (m_addon_InputResample.pAddon)
     delay += m_addon_InputResample.pAddon->InputResampleGetDelay(&m_addon_InputResample.handle);
 
-  for (unsigned int i = 0; i < m_addons_PreProc.size(); i++)
+  for (unsigned int i = 0; i < m_addons_PreProc.size(); ++i)
     delay += m_addons_PreProc[i].pAddon->PreProcessGetDelay(&m_addons_PreProc[i].handle, m_addons_PreProc[i].iAddonModeNumber);
 
   if (m_addons_MasterProc[m_activeMode].pAddon)
     delay += m_addons_MasterProc[m_activeMode].pAddon->MasterProcessGetDelay(&m_addons_MasterProc[m_activeMode].handle);
 
-  for (unsigned int i = 0; i < m_addons_PostProc.size(); i++)
+  for (unsigned int i = 0; i < m_addons_PostProc.size(); ++i)
     delay += m_addons_PostProc[i].pAddon->PostProcessGetDelay(&m_addons_PostProc[i].handle, m_addons_PostProc[i].iAddonModeNumber);
 
   if (m_addon_OutputResample.pAddon)
@@ -1749,14 +1749,14 @@ void CActiveAEDSPProcess::GetActiveModes(AE_DSP_MODE_TYPE type, std::vector<CAct
     modes.push_back(m_addon_InputResample.pMode);
 
   if (type == AE_DSP_MODE_TYPE_UNDEFINED || type == AE_DSP_MODE_TYPE_PRE_PROCESS)
-    for (unsigned int i = 0; i < m_addons_PreProc.size(); i++)
+    for (unsigned int i = 0; i < m_addons_PreProc.size(); ++i)
       modes.push_back(m_addons_PreProc[i].pMode);
 
   if (m_addons_MasterProc[m_activeMode].pAddon != NULL && (type == AE_DSP_MODE_TYPE_UNDEFINED || type == AE_DSP_MODE_TYPE_MASTER_PROCESS))
     modes.push_back(m_addons_MasterProc[m_activeMode].pMode);
 
   if (type == AE_DSP_MODE_TYPE_UNDEFINED || type == AE_DSP_MODE_TYPE_POST_PROCESS)
-    for (unsigned int i = 0; i < m_addons_PostProc.size(); i++)
+    for (unsigned int i = 0; i < m_addons_PostProc.size(); ++i)
       modes.push_back(m_addons_PostProc[i].pMode);
 
   if (m_addon_OutputResample.pAddon != NULL && (type == AE_DSP_MODE_TYPE_UNDEFINED || type == AE_DSP_MODE_TYPE_OUTPUT_RESAMPLE))
@@ -1767,7 +1767,7 @@ void CActiveAEDSPProcess::GetAvailableMasterModes(AE_DSP_STREAMTYPE streamType,
 {
   CSingleLock lock(m_critSection);
 
-  for (unsigned int i = 0; i < m_addons_MasterProc.size(); i++)
+  for (unsigned int i = 0; i < m_addons_MasterProc.size(); ++i)
   {
     if (m_addons_MasterProc[i].pMode->SupportStreamType(streamType))
       modes.push_back(m_addons_MasterProc[i].pMode);
@@ -1845,7 +1845,7 @@ bool CActiveAEDSPProcess::IsMenuHookModeActive(AE_DSP_MENUHOOK_CAT category, int
 
   if (addons)
   {
-    for (unsigned int i = 0; i < addons->size(); i++)
+    for (unsigned int i = 0; i < addons->size(); ++i)
     {
       if (addons->at(i).iAddonModeNumber > 0 &&
           addons->at(i).pMode->AddonID() == iAddonId &&