sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MemoryCard: Purge use of ByteStream

Browse Source
This commit is contained in:
Stenzek
2024-07-28 23:28:13 +10:00
parent b5009da2bc
commit dd8bf2c9d9
8 changed files with 86 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/duckstation-qt/memorycardeditorwindow.cpp
View File

@ -96,12 +96,12 @@ bool MemoryCardEditorWindow::setCardB(const QString& path)
return true;
}
bool MemoryCardEditorWindow::createMemoryCard(const QString& path)
bool MemoryCardEditorWindow::createMemoryCard(const QString& path, Error* error)
{
MemoryCardImage::DataArray data;
MemoryCardImage::Format(&data);
return MemoryCardImage::SaveToFile(data, path.toUtf8().constData());
return MemoryCardImage::SaveToFile(data, path.toUtf8().constData(), error);
}
void MemoryCardEditorWindow::resizeEvent(QResizeEvent* ev)
@ -232,10 +232,12 @@ bool MemoryCardEditorWindow::loadCard(const QString& filename, Card* card)
return false;
}
Error error;
std::string filename_str = filename.toStdString();
if (!MemoryCardImage::LoadFromFile(&card->data, filename_str.c_str()))
if (!MemoryCardImage::LoadFromFile(&card->data, filename_str.c_str(), &error))
{
QMessageBox::critical(this, tr("Error"), tr("Failed to load memory card image."));
QMessageBox::critical(this, tr("Error"),
tr("Failed to load memory card: %1").arg(QString::fromStdString(error.GetDescription())));
return false;
}
@ -343,9 +345,11 @@ void MemoryCardEditorWindow::openCard(Card* card)
if (filename.isEmpty())
return;
if (!MemoryCardImage::LoadFromFile(&card->data, filename.toUtf8().constData()))
Error error;
if (!MemoryCardImage::LoadFromFile(&card->data, filename.toUtf8().constData(), &error))
{
QMessageBox::critical(this, tr("Error"), tr("Failed to load memory card image."));
QMessageBox::critical(this, tr("Error"),
tr("Failed to load memory card: %1").arg(QString::fromStdString(error.GetDescription())));
return;
}
@ -368,10 +372,11 @@ void MemoryCardEditorWindow::saveCard(Card* card)
if (card->filename.empty())
return;
if (!MemoryCardImage::SaveToFile(card->data, card->filename.c_str()))
Error error;
if (!MemoryCardImage::SaveToFile(card->data, card->filename.c_str(), &error))
{
QMessageBox::critical(this, tr("Error"),
tr("Failed to write card to '%1'").arg(QString::fromStdString(card->filename)));
tr("Failed to save memory card: %1").arg(QString::fromStdString(error.GetDescription())));
return;
}