ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13017 from Tilka/foo 

DolphinTool: print title IDs in hex
This commit is contained in:
Tilka 2024-08-16 20:02:01 +01:00 committed by GitHub
parent d10c3aaf29 884a38f04d
commit 1759d27267
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt/ConvertDialog.cpp
View File

@ -367,7 +367,7 @@ void ConvertDialog::Convert()
if (m_files.size() > 1) if (m_files.size() > 1)
{ {
dst_dir = DolphinFileDialog::getExistingDirectory( dst_dir = DolphinFileDialog::getExistingDirectory(
this, tr("Save Converted Image"), this, tr("Save Converted Images"),
QFileInfo(QString::fromStdString(m_files[0]->GetFilePath())).dir().absolutePath()); QFileInfo(QString::fromStdString(m_files[0]->GetFilePath())).dir().absolutePath());
if (dst_dir.isEmpty()) if (dst_dir.isEmpty())

2
Source/Core/DolphinTool/ConvertCommand.cpp
View File

@ -260,7 +260,7 @@ int ConvertCommand(const std::vector<std::string>& args)
{ {
if (!compression_o.has_value()) if (!compression_o.has_value())
{ {
fmt::print(std::cerr, "Error: Compression format must be set for WIA or RVZ\n"); fmt::print(std::cerr, "Error: Compression method must be set for WIA or RVZ\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }

6
Source/Core/DolphinTool/HeaderCommand.cpp
View File

@ -92,7 +92,7 @@ int HeaderCommand(const std::vector<std::string>& args)
{ {
json["internal_name"] = picojson::value(volume->GetInternalName()); json["internal_name"] = picojson::value(volume->GetInternalName());
if (const std::optional<u64> revision = volume->GetRevision()) if (const std::optional<u16> revision = volume->GetRevision())
json["revision"] = picojson::value((double)revision.value()); json["revision"] = picojson::value((double)revision.value());
json["game_id"] = picojson::value(volume->GetGameID()); json["game_id"] = picojson::value(volume->GetGameID());
@ -153,13 +153,13 @@ int HeaderCommand(const std::vector<std::string>& args)
{ {
fmt::print(std::cout, "Internal Name: {}\n", volume->GetInternalName()); fmt::print(std::cout, "Internal Name: {}\n", volume->GetInternalName());
if (const std::optional<u64> revision = volume->GetRevision()) if (const std::optional<u16> revision = volume->GetRevision())
fmt::print(std::cout, "Revision: {}\n", revision.value()); fmt::print(std::cout, "Revision: {}\n", revision.value());
fmt::print(std::cout, "Game ID: {}\n", volume->GetGameID()); fmt::print(std::cout, "Game ID: {}\n", volume->GetGameID());
if (const std::optional<u64> title_id = volume->GetTitleID()) if (const std::optional<u64> title_id = volume->GetTitleID())
fmt::print(std::cout, "Title ID: {}\n", title_id.value()); fmt::print(std::cout, "Title ID: {:016x}\n", title_id.value());
fmt::print(std::cout, "Region: {}\n", DiscIO::GetName(volume->GetRegion(), false)); fmt::print(std::cout, "Region: {}\n", DiscIO::GetName(volume->GetRegion(), false));