Browse Source

Don't trigger ENGINE_CALLBACK_UPDATE under certain conditions

tags/v1.9.11
falkTX 7 years ago
parent
commit
6184eadbcb
4 changed files with 16 additions and 3 deletions
  1. +5
    -0
      source/backend/CarlaEngine.hpp
  2. +5
    -0
      source/backend/engine/CarlaEngine.cpp
  3. +3
    -2
      source/backend/plugin/CarlaPlugin.cpp
  4. +3
    -1
      source/backend/plugin/CarlaPluginVST2.cpp

+ 5
- 0
source/backend/CarlaEngine.hpp View File

@@ -1036,6 +1036,11 @@ public:
*/
bool setAboutToClose() noexcept;

/*!
* TODO.
*/
bool isLoadingProject() const noexcept;

// -------------------------------------------------------------------
// Options



+ 5
- 0
source/backend/engine/CarlaEngine.cpp View File

@@ -1301,6 +1301,11 @@ bool CarlaEngine::setAboutToClose() noexcept
return (pData->isIdling == 0);
}

bool CarlaEngine::isLoadingProject() const noexcept
{
return pData->loadingProject;
}

// -----------------------------------------------------------------------
// Global options



+ 3
- 2
source/backend/plugin/CarlaPlugin.cpp View File

@@ -888,9 +888,10 @@ void CarlaPlugin::loadStateSave(const CarlaStateSave& stateSave)
setPanning(stateSave.panning, true, true);
setCtrlChannel(stateSave.ctrlChannel, true, true);
setActive(stateSave.active, true, true);
#endif

pData->engine->callback(ENGINE_CALLBACK_UPDATE, pData->id, 0, 0, 0.0f, nullptr);
if (! pData->engine->isLoadingProject())
pData->engine->callback(ENGINE_CALLBACK_UPDATE, pData->id, 0, 0, 0.0f, nullptr);
#endif
}

bool CarlaPlugin::saveStateToFile(const char* const filename)


+ 3
- 1
source/backend/plugin/CarlaPluginVST2.cpp View File

@@ -2085,7 +2085,9 @@ protected:
}
}

pData->engine->callback(ENGINE_CALLBACK_UPDATE, pData->id, 0, 0, 0.0f, nullptr);
if (! fIsInitializing)
pData->engine->callback(ENGINE_CALLBACK_UPDATE, pData->id, 0, 0, 0.0f, nullptr);

ret = 1;
break;



Loading…
Cancel
Save