mirror of https://github.com/PCSX2/pcsx2.git
Formatting: clang-format + copyright headers
This commit is contained in:
Romain TISSERAND
refractionpcsx2
parent
742b829c82
commit
b436898d2a
|
|
@ -1,3 +1,18 @@
|
|||
/* PCSX2 - PS2 Emulator for PCs
|
||||
* Copyright (C) 2002-2021 PCSX2 Dev Team
|
||||
*
|
||||
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU Lesser General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with PCSX2.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "PrecompiledHeader.h"
|
||||
#include "ChdFileReader.h"
|
||||
|
||||
|
|
@ -6,132 +21,148 @@
|
|||
#include <wx/dir.h>
|
||||
|
||||
|
||||
bool ChdFileReader::CanHandle(const wxString &fileName)
|
||||
bool ChdFileReader::CanHandle(const wxString& fileName)
|
||||
{
|
||||
if (!wxFileName::FileExists(fileName) || !fileName.Lower().EndsWith(L".chd")) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
if (!wxFileName::FileExists(fileName) || !fileName.Lower().EndsWith(L".chd"))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ChdFileReader::Open(const wxString &fileName)
|
||||
bool ChdFileReader::Open(const wxString& fileName)
|
||||
{
|
||||
m_filename = fileName;
|
||||
m_filename = fileName;
|
||||
|
||||
chd_file *child = NULL;
|
||||
chd_file *parent = NULL;
|
||||
chd_header *header = new chd_header;
|
||||
chd_header *parent_header = new chd_header;
|
||||
chd_file* child = NULL;
|
||||
chd_file* parent = NULL;
|
||||
chd_header* header = new chd_header;
|
||||
chd_header* parent_header = new chd_header;
|
||||
|
||||
wxString chds[8];
|
||||
chds[0] = fileName;
|
||||
int chd_depth = 0;
|
||||
chd_error error;
|
||||
wxString chds[8];
|
||||
chds[0] = fileName;
|
||||
int chd_depth = 0;
|
||||
chd_error error;
|
||||
|
||||
do {
|
||||
// Console.Error(L"chd_open checking: %s", static_cast<const char*>(chds[chd_depth]));
|
||||
error = chd_open(static_cast<const char*>(chds[chd_depth]), CHD_OPEN_READ, NULL, &child);
|
||||
if (error == CHDERR_REQUIRES_PARENT) {
|
||||
if (chd_read_header(static_cast<const char*>(chds[chd_depth]), header) != CHDERR_NONE) {
|
||||
Console.Error(L"chd_open chd_read_header error: %s: %s", chd_error_string(error), static_cast<const char*>(chds[chd_depth]));
|
||||
delete header;
|
||||
delete parent_header;
|
||||
return false;
|
||||
}
|
||||
bool found_parent = false;
|
||||
wxFileName wxfilename(chds[chd_depth]);
|
||||
wxString dir_path = wxfilename.GetPath();
|
||||
wxDir dir(dir_path);
|
||||
if (dir.IsOpened()) {
|
||||
wxString parent_fileName;
|
||||
bool cont = dir.GetFirst(&parent_fileName, wxString("*.", wxfilename.GetExt()), wxDIR_FILES | wxDIR_HIDDEN);
|
||||
while ( cont ) {
|
||||
parent_fileName = wxFileName(dir_path, parent_fileName).GetFullPath();
|
||||
if (chd_read_header(static_cast<const char*>(parent_fileName), parent_header) == CHDERR_NONE &&
|
||||
memcmp(parent_header->sha1, header->parentsha1, sizeof(parent_header->sha1)) == 0) {
|
||||
found_parent = true;
|
||||
chds[++chd_depth] = wxString(parent_fileName);
|
||||
break;
|
||||
}
|
||||
cont = dir.GetNext(&parent_fileName);
|
||||
}
|
||||
}
|
||||
if (!found_parent) {
|
||||
Console.Error(L"chd_open no parent for: %s", static_cast<const char*>(chds[chd_depth]));
|
||||
break;
|
||||
}
|
||||
}
|
||||
} while(error == CHDERR_REQUIRES_PARENT);
|
||||
delete parent_header;
|
||||
do
|
||||
{
|
||||
// Console.Error(L"chd_open checking: %s", static_cast<const char*>(chds[chd_depth]));
|
||||
error = chd_open(static_cast<const char*>(chds[chd_depth]), CHD_OPEN_READ, NULL, &child);
|
||||
if (error == CHDERR_REQUIRES_PARENT)
|
||||
{
|
||||
if (chd_read_header(static_cast<const char*>(chds[chd_depth]), header) != CHDERR_NONE)
|
||||
{
|
||||
Console.Error(L"chd_open chd_read_header error: %s: %s", chd_error_string(error), static_cast<const char*>(chds[chd_depth]));
|
||||
delete header;
|
||||
delete parent_header;
|
||||
return false;
|
||||
}
|
||||
bool found_parent = false;
|
||||
wxFileName wxfilename(chds[chd_depth]);
|
||||
wxString dir_path = wxfilename.GetPath();
|
||||
wxDir dir(dir_path);
|
||||
if (dir.IsOpened())
|
||||
{
|
||||
wxString parent_fileName;
|
||||
bool cont = dir.GetFirst(&parent_fileName, wxString("*.", wxfilename.GetExt()), wxDIR_FILES | wxDIR_HIDDEN);
|
||||
while (cont)
|
||||
{
|
||||
parent_fileName = wxFileName(dir_path, parent_fileName).GetFullPath();
|
||||
if (chd_read_header(static_cast<const char*>(parent_fileName), parent_header) == CHDERR_NONE &&
|
||||
memcmp(parent_header->sha1, header->parentsha1, sizeof(parent_header->sha1)) == 0)
|
||||
{
|
||||
found_parent = true;
|
||||
chds[++chd_depth] = wxString(parent_fileName);
|
||||
break;
|
||||
}
|
||||
cont = dir.GetNext(&parent_fileName);
|
||||
}
|
||||
}
|
||||
if (!found_parent)
|
||||
{
|
||||
Console.Error(L"chd_open no parent for: %s", static_cast<const char*>(chds[chd_depth]));
|
||||
break;
|
||||
}
|
||||
}
|
||||
} while (error == CHDERR_REQUIRES_PARENT);
|
||||
delete parent_header;
|
||||
|
||||
if (error != CHDERR_NONE) {
|
||||
Console.Error(L"chd_open return error: %s", chd_error_string(error));
|
||||
delete header;
|
||||
return false;
|
||||
}
|
||||
if (error != CHDERR_NONE)
|
||||
{
|
||||
Console.Error(L"chd_open return error: %s", chd_error_string(error));
|
||||
delete header;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Console.Error(L"chd_opened parent: %d %s", chd_depth, static_cast<const char*>(chds[chd_depth]));
|
||||
for (int d = chd_depth-1; d >= 0; d--) {
|
||||
// parent = child;
|
||||
// child = (chd_file**)malloc(sizeof(chd_file*));
|
||||
parent = child;
|
||||
child = NULL;
|
||||
// Console.Error(L"chd_open opening chd: %d %s", d, static_cast<const char*>(chds[d]));
|
||||
error = chd_open(static_cast<const char*>(chds[d]), CHD_OPEN_READ, parent, &child);
|
||||
if (error != CHDERR_NONE) {
|
||||
Console.Error(L"chd_open return error: %s", chd_error_string(error));
|
||||
delete header;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
ChdFile = child;
|
||||
if (chd_read_header(static_cast<const char*>(chds[0]), header) != CHDERR_NONE) {
|
||||
Console.Error(L"chd_open chd_read_header error: %s: %s", chd_error_string(error), static_cast<const char*>(chds[0]));
|
||||
delete header;
|
||||
return false;
|
||||
}
|
||||
// Console.Error(L"chd_opened parent: %d %s", chd_depth, static_cast<const char*>(chds[chd_depth]));
|
||||
for (int d = chd_depth - 1; d >= 0; d--)
|
||||
{
|
||||
// parent = child;
|
||||
// child = (chd_file**)malloc(sizeof(chd_file*));
|
||||
parent = child;
|
||||
child = NULL;
|
||||
// Console.Error(L"chd_open opening chd: %d %s", d, static_cast<const char*>(chds[d]));
|
||||
error = chd_open(static_cast<const char*>(chds[d]), CHD_OPEN_READ, parent, &child);
|
||||
if (error != CHDERR_NONE)
|
||||
{
|
||||
Console.Error(L"chd_open return error: %s", chd_error_string(error));
|
||||
delete header;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
ChdFile = child;
|
||||
if (chd_read_header(static_cast<const char*>(chds[0]), header) != CHDERR_NONE)
|
||||
{
|
||||
Console.Error(L"chd_open chd_read_header error: %s: %s", chd_error_string(error), static_cast<const char*>(chds[0]));
|
||||
delete header;
|
||||
return false;
|
||||
}
|
||||
|
||||
// const chd_header *header = chd_get_header(ChdFile);
|
||||
sector_size = header->unitbytes;
|
||||
sector_count = header->unitcount;
|
||||
sectors_per_hunk = header->hunkbytes / sector_size;
|
||||
hunk_buffer = new u8[header->hunkbytes];
|
||||
current_hunk = -1;
|
||||
// const chd_header *header = chd_get_header(ChdFile);
|
||||
sector_size = header->unitbytes;
|
||||
sector_count = header->unitcount;
|
||||
sectors_per_hunk = header->hunkbytes / sector_size;
|
||||
hunk_buffer = new u8[header->hunkbytes];
|
||||
current_hunk = -1;
|
||||
|
||||
delete header;
|
||||
return true;
|
||||
delete header;
|
||||
return true;
|
||||
}
|
||||
|
||||
int ChdFileReader::ReadSync(void *pBuffer, uint sector, uint count)
|
||||
int ChdFileReader::ReadSync(void* pBuffer, uint sector, uint count)
|
||||
{
|
||||
u8 *dst = (u8 *) pBuffer;
|
||||
u32 hunk = sector / sectors_per_hunk;
|
||||
u32 sector_in_hunk = sector % sectors_per_hunk;
|
||||
chd_error error;
|
||||
u8* dst = (u8*)pBuffer;
|
||||
u32 hunk = sector / sectors_per_hunk;
|
||||
u32 sector_in_hunk = sector % sectors_per_hunk;
|
||||
chd_error error;
|
||||
|
||||
for (uint i = 0; i < count; i++) {
|
||||
if (current_hunk != hunk) {
|
||||
error = chd_read(ChdFile, hunk, hunk_buffer);
|
||||
if (error != CHDERR_NONE) {
|
||||
Console.Error(L"chd_read return error: %s", chd_error_string(error));
|
||||
// return i * m_blocksize;
|
||||
}
|
||||
current_hunk = hunk;
|
||||
}
|
||||
memcpy(dst + i * m_blocksize, hunk_buffer + sector_in_hunk * sector_size, m_blocksize);
|
||||
sector_in_hunk++;
|
||||
if (sector_in_hunk >= sectors_per_hunk) {
|
||||
hunk++;
|
||||
sector_in_hunk = 0;
|
||||
}
|
||||
}
|
||||
return m_blocksize * count;
|
||||
for (uint i = 0; i < count; i++)
|
||||
{
|
||||
if (current_hunk != hunk)
|
||||
{
|
||||
error = chd_read(ChdFile, hunk, hunk_buffer);
|
||||
if (error != CHDERR_NONE)
|
||||
{
|
||||
Console.Error(L"chd_read return error: %s", chd_error_string(error));
|
||||
// return i * m_blocksize;
|
||||
}
|
||||
current_hunk = hunk;
|
||||
}
|
||||
memcpy(dst + i * m_blocksize, hunk_buffer + sector_in_hunk * sector_size, m_blocksize);
|
||||
sector_in_hunk++;
|
||||
if (sector_in_hunk >= sectors_per_hunk)
|
||||
{
|
||||
hunk++;
|
||||
sector_in_hunk = 0;
|
||||
}
|
||||
}
|
||||
return m_blocksize * count;
|
||||
}
|
||||
|
||||
void ChdFileReader::BeginRead(void *pBuffer, uint sector, uint count)
|
||||
void ChdFileReader::BeginRead(void* pBuffer, uint sector, uint count)
|
||||
{
|
||||
// TODO: Check if libchdr can read asynchronously
|
||||
async_read = ReadSync(pBuffer, sector, count);
|
||||
// TODO: Check if libchdr can read asynchronously
|
||||
async_read = ReadSync(pBuffer, sector, count);
|
||||
}
|
||||
|
||||
int ChdFileReader::FinishRead()
|
||||
|
|
@ -141,33 +172,35 @@ int ChdFileReader::FinishRead()
|
|||
|
||||
void ChdFileReader::Close()
|
||||
{
|
||||
if (hunk_buffer != NULL) {
|
||||
//free(hunk_buffer);
|
||||
delete[] hunk_buffer;
|
||||
hunk_buffer = NULL;
|
||||
}
|
||||
if (ChdFile != NULL) {
|
||||
chd_close(ChdFile);
|
||||
ChdFile = NULL;
|
||||
}
|
||||
if (hunk_buffer != NULL)
|
||||
{
|
||||
//free(hunk_buffer);
|
||||
delete[] hunk_buffer;
|
||||
hunk_buffer = NULL;
|
||||
}
|
||||
if (ChdFile != NULL)
|
||||
{
|
||||
chd_close(ChdFile);
|
||||
ChdFile = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
uint ChdFileReader::GetBlockSize() const
|
||||
{
|
||||
return m_blocksize;
|
||||
return m_blocksize;
|
||||
}
|
||||
|
||||
void ChdFileReader::SetBlockSize(uint blocksize)
|
||||
{
|
||||
m_blocksize = blocksize;
|
||||
m_blocksize = blocksize;
|
||||
}
|
||||
|
||||
u32 ChdFileReader::GetBlockCount() const
|
||||
{
|
||||
return sector_count;
|
||||
return sector_count;
|
||||
}
|
||||
ChdFileReader::ChdFileReader(void)
|
||||
{
|
||||
ChdFile = NULL;
|
||||
hunk_buffer = NULL;
|
||||
ChdFile = NULL;
|
||||
hunk_buffer = NULL;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,34 +1,50 @@
|
|||
/* PCSX2 - PS2 Emulator for PCs
|
||||
* Copyright (C) 2002-2021 PCSX2 Dev Team
|
||||
*
|
||||
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU Lesser General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with PCSX2.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "AsyncFileReader.h"
|
||||
#include "libchdr/chd.h"
|
||||
|
||||
class ChdFileReader : public AsyncFileReader
|
||||
{
|
||||
DeclareNoncopyableObject(ChdFileReader);
|
||||
DeclareNoncopyableObject(ChdFileReader);
|
||||
|
||||
public:
|
||||
virtual ~ChdFileReader(void) { Close(); };
|
||||
virtual ~ChdFileReader(void) { Close(); };
|
||||
|
||||
static bool CanHandle(const wxString &fileName);
|
||||
bool Open(const wxString &fileName) override;
|
||||
static bool CanHandle(const wxString& fileName);
|
||||
bool Open(const wxString& fileName) override;
|
||||
|
||||
int ReadSync(void *pBuffer, uint sector, uint count) override;
|
||||
int ReadSync(void* pBuffer, uint sector, uint count) override;
|
||||
|
||||
void BeginRead(void *pBuffer, uint sector, uint count) override;
|
||||
int FinishRead(void) override;
|
||||
void CancelRead(void) override {};
|
||||
void BeginRead(void* pBuffer, uint sector, uint count) override;
|
||||
int FinishRead(void) override;
|
||||
void CancelRead(void) override{};
|
||||
|
||||
void Close(void) override;
|
||||
void SetBlockSize(uint blocksize);
|
||||
uint GetBlockSize() const;
|
||||
uint GetBlockCount(void) const override;
|
||||
ChdFileReader(void);
|
||||
void Close(void) override;
|
||||
void SetBlockSize(uint blocksize);
|
||||
uint GetBlockSize() const;
|
||||
uint GetBlockCount(void) const override;
|
||||
ChdFileReader(void);
|
||||
|
||||
private:
|
||||
chd_file *ChdFile;
|
||||
u8 *hunk_buffer;
|
||||
u32 sector_size;
|
||||
u32 sector_count;
|
||||
u32 sectors_per_hunk;
|
||||
u32 current_hunk;
|
||||
u32 async_read;
|
||||
chd_file* ChdFile;
|
||||
u8* hunk_buffer;
|
||||
u32 sector_size;
|
||||
u32 sector_count;
|
||||
u32 sectors_per_hunk;
|
||||
u32 current_hunk;
|
||||
u32 async_read;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@
|
|||
// CompressedFileReader factory.
|
||||
AsyncFileReader* CompressedFileReader::GetNewReader(const wxString& fileName)
|
||||
{
|
||||
if (ChdFileReader::CanHandle(fileName)) {
|
||||
if (ChdFileReader::CanHandle(fileName))
|
||||
{
|
||||
return new ChdFileReader();
|
||||
}
|
||||
if (GzippedFileReader::CanHandle(fileName))
|
||||
|
|
|
|||
Loading…
Reference in New Issue