Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-04 12:47:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Glitter Editor improvements. Added OBJHRC to MOT conversion for PV826

Browse Source
This commit is contained in:
korenkonder
2022-12-29 08:43:50 +03:00
parent e570ae190f
commit 3fc7be1b3b
84 changed files with 3303 additions and 1566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/file_handler.cpp
+21 -21
View File
@@ -112,7 +112,7 @@ void file_handler::set_callback_data(int32_t index, PFNFILEHANDLERCALLBACK* func
}
}
void file_handler::free_data_lock() {
void file_handler::reset() {
bool free_fhndl = false;
{
@@ -299,7 +299,7 @@ static void file_handler_storage_ctrl_list() {
for (std::list<file_handler*>::iterator i = list.begin(); i != list.end();) {
file_handler* pfhndl = *i;
if (pfhndl->count == 1) {
pfhndl->free_data_lock();
pfhndl->reset();
i = list.erase(i);
}
else {
@@ -331,7 +331,7 @@ static void file_handler_storage_thread_ctrl() {
}
i->reading = false;
}
i->free_data_lock();
i->reset();
}
file_handler_storage_data->deque.clear();
}
@@ -347,14 +347,14 @@ p_file_handler::~p_file_handler() {
if (check_not_ready())
call_free_callback();
else
free_data();
reset();
}
}
void p_file_handler::call_free_callback() {
if (ptr)
ptr->call_callback(1);
free_data();
reset();
}
bool p_file_handler::check_not_ready() {
@@ -366,20 +366,6 @@ bool p_file_handler::check_not_ready() {
return !ptr->callback[0].ready;
}
void p_file_handler::free_data() {
if (!ptr)
return;
{
std::unique_lock<std::mutex> u_lock(ptr->mtx);
for (int32_t i = 0; i < 2; i++)
ptr->callback[i] = {};
}
ptr->free_data_lock();
ptr = 0;
}
const void* p_file_handler::get_data() {
if (!ptr || ptr->not_ready)
return 0;
@@ -415,7 +401,7 @@ bool p_file_handler::read_file(void* data, const char* dir,
if (ptr) {
if (ptr->not_ready)
return false;
free_data();
reset();
}
if (!((data_struct*)data)->check_file_exists(dir, farc_file ? farc_file : file))
@@ -457,7 +443,7 @@ bool p_file_handler::read_file(void* data, const char* dir, uint32_t hash, const
if (ptr) {
if (ptr->not_ready)
return false;
free_data();
reset();
}
std::string file;
@@ -514,6 +500,20 @@ void p_file_handler::read_now() {
}
}
void p_file_handler::reset() {
if (!ptr)
return;
{
std::unique_lock<std::mutex> u_lock(ptr->mtx);
for (int32_t i = 0; i < 2; i++)
ptr->callback[i] = {};
}
ptr->reset();
ptr = 0;
}
void p_file_handler::set_callback_data(int32_t index, PFNFILEHANDLERCALLBACK* func, void* data) {
if (ptr)
ptr->set_callback_data(index, func, data);