Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-05 14:18:53 +02:00
Code Issues Releases Wiki Activity

Redo resource RAII without the dubious casts

Browse Source
This commit is contained in:
Paul Licameli 2018-11-15 10:35:36 -05:00
parent cc34abea61
commit 7c1216edc6
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/effects/VST/VSTEffect.cpp
View File

@ -1114,12 +1114,12 @@ void VSTEffect::BundleDeleter::operator() (void* p) const
CFRelease(static_cast<CFBundleRef>(p));
}
void VSTEffect::ResourceDeleter::operator() (void *p) const
void VSTEffect::ResourceHandle::reset()
{
if (mpHandle) {
int resource = (int)p;
CFBundleCloseBundleResourceMap(mpHandle->get(), resource);
}
if (mpHandle)
CFBundleCloseBundleResourceMap(mpHandle, mNum);
mpHandle = nullptr;
mNum = 0;
}
#endif
@ -2062,9 +2062,7 @@ bool VSTEffect::Load()
// Open the resource map ... some plugins (like GRM Tools) need this.
mResource = ResourceHandle{
reinterpret_cast<char*>(
CFBundleOpenBundleResourceMap(mBundleRef.get())),
ResourceDeleter{&mBundleRef}
mBundleRef.get(), CFBundleOpenBundleResourceMap(mBundleRef.get())
};
#elif defined(__WXMSW__)
@ -2267,7 +2265,7 @@ void VSTEffect::Unload()
if (mModule)
{
#if defined(__WXMAC__)
mResource = ResourceHandle{};
mResource.reset();
mBundleRef.reset();
#endif

28
src/effects/VST/VSTEffect.h
View File

@ -302,15 +302,27 @@ private:
BundleHandle mBundleRef;
struct ResourceDeleter {
const BundleHandle *mpHandle;
ResourceDeleter(const BundleHandle *pHandle = nullptr)
: mpHandle(pHandle) {}
void operator() (void*) const;
struct ResourceHandle {
ResourceHandle(
CFBundleRef pHandle = nullptr, CFBundleRefNum num = 0)
: mpHandle{ pHandle }, mNum{ num }
{}
ResourceHandle& operator=( ResourceHandle &&other )
{
if (this != &other) {
mpHandle = other.mpHandle;
mNum = other.mNum;
other.mpHandle = nullptr;
other.mNum = 0;
}
return *this;
}
~ResourceHandle() { reset(); }
void reset();
CFBundleRef mpHandle{};
CFBundleRefNum mNum{};
};
using ResourceHandle = std::unique_ptr<
char, ResourceDeleter
>;
ResourceHandle mResource;
#endif