AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Thread-safe extraction

Browse Source
This commit is contained in:
Jack Andersen
2016-03-31 18:25:00 -10:00
parent 9fcce94a7a
commit 8fc0d57500
28 changed files with 162 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
DataSpec/SpecMP3.cpp
View File

@@ -8,6 +8,8 @@
#include "DNAMP3/STRG.hpp"
#include "DNAMP2/STRG.hpp"
#include "hecl/ClientProcess.hpp"
namespace DataSpec
{
@@ -366,6 +368,8 @@ struct SpecMP3 : SpecBase
progress(currentTarget.c_str(), _S(""), compIdx++, 1.0);
std::mutex msgLock;
hecl::ClientProcess process;
prog = 0;
for (std::pair<std::string, DNAMP3::PAKBridge*> pair : m_orderedPaks)
{
@@ -376,13 +380,20 @@ struct SpecMP3 : SpecBase
const std::string& name = pak.getName();
hecl::SystemStringView sysName(name);
progress(sysName.sys_str().c_str(), _S(""), compIdx, 0.0);
m_pakRouter.extractResources(pak, force,
[&progress, &sysName, &compIdx](const hecl::SystemChar* substr, float factor)
{
progress(sysName.sys_str().c_str(), substr, compIdx, factor);
std::unique_lock<std::mutex> lk(msgLock);
progress(sysName.sys_str().c_str(), _S(""), compIdx, 0.0);
}
hecl::SystemString pakName = sysName.sys_str();
process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok)
{
m_pakRouter.extractResources(pak, force, true, btok,
[&](const hecl::SystemChar* substr, float factor)
{
std::unique_lock<std::mutex> lk(msgLock);
progress(pakName.c_str(), substr, compIdx, factor);
});
});
progress(sysName.sys_str().c_str(), _S(""), compIdx++, 1.0);
}
}
@@ -417,6 +428,8 @@ struct SpecMP3 : SpecBase
}
progress(currentTarget.c_str(), _S(""), compIdx++, 1.0);
std::mutex msgLock;
hecl::ClientProcess process;
prog = 0;
for (std::pair<std::string, DNAMP3::PAKBridge*> pair : m_feOrderedPaks)
{
@@ -427,13 +440,20 @@ struct SpecMP3 : SpecBase
const std::string& name = pak.getName();
hecl::SystemStringView sysName(name);
progress(sysName.sys_str().c_str(), _S(""), compIdx, 0.0);
m_fePakRouter.extractResources(pak, force,
[&progress, &sysName, &compIdx](const hecl::SystemChar* substr, float factor)
{
progress(sysName.sys_str().c_str(), substr, compIdx, factor);
std::unique_lock<std::mutex> lk(msgLock);
progress(sysName.sys_str().c_str(), _S(""), compIdx, 0.0);
}
hecl::SystemString pakName = sysName.sys_str();
process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok)
{
m_fePakRouter.extractResources(pak, force, true, btok,
[&](const hecl::SystemChar* substr, float factor)
{
std::unique_lock<std::mutex> lk(msgLock);
progress(pakName.c_str(), substr, compIdx, factor);
});
});
progress(sysName.sys_str().c_str(), _S(""), compIdx++, 1.0);
}
}
return true;