bp/FrameLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct the SC global object to work across compilation units

Browse Source
This commit is contained in:
Alex Harker
2019-12-05 17:01:01 +00:00
parent 129950e576
commit 02f7a52dcc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FrameLib_SC_UGens/FrameLib_SC.cpp
+6 -4
View File
@@ -34,7 +34,7 @@ struct SC_FrameLib_Global
{ {
unit->mFrameLibCalcFunc(unit, inNumSamples); unit->mFrameLibCalcFunc(unit, inNumSamples);
} }
class Notifier : public FrameLib_ErrorReporter::HostNotifier class Notifier : public FrameLib_ErrorReporter::HostNotifier
{ {
bool notify(const FrameLib_ErrorReporter::ErrorReport& report) override bool notify(const FrameLib_ErrorReporter::ErrorReport& report) override
@@ -49,6 +49,7 @@ struct SC_FrameLib_Global
SC_FrameLib_Global() : mGlobal(nullptr) SC_FrameLib_Global() : mGlobal(nullptr)
{ {
FrameLib_Global::get(&mGlobal, &mNotifier); FrameLib_Global::get(&mGlobal, &mNotifier);
mCalcFunc = (UnitCalcFunc) CalcFunc;
} }
~SC_FrameLib_Global() ~SC_FrameLib_Global()
@@ -60,13 +61,14 @@ struct SC_FrameLib_Global
{ {
return unit && (unit->mCalcFunc == GetCalcFunc()); return unit && (unit->mCalcFunc == GetCalcFunc());
} }
UnitCalcFunc GetCalcFunc() const { return (UnitCalcFunc) CalcFunc; } UnitCalcFunc GetCalcFunc() const { return mCalcFunc; }
FrameLib_Global *getGlobal() { return mGlobal; } FrameLib_Global *getGlobal() { return mGlobal; }
FrameLib_Global *mGlobal; FrameLib_Global *mGlobal;
Notifier mNotifier; Notifier mNotifier;
UnitCalcFunc mCalcFunc;
}; };
static SC_FrameLib_Global sGlobal; static SC_FrameLib_Global sGlobal;