Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 16:01:56 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

-util/cdrom.cpp: Fixed issues with CUE, TOC and GDI parsers. (#12948)

Browse Source 
* Rewrote GDI parser to be more robust and identify more kinds of invalid input.
* Don't ignore the last line in CUE and TOC files if there is no terminating newline.
* Use osd_printf_ family functions for output.

-tools/chdman.cpp: Added a sink for osd_printf_ family function output.
This commit is contained in:
987123879113 2024-11-09 01:23:07 +09:00 committed by GitHub
parent e9dcdb5200
commit 2c8de2ee29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 591 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1015
src/lib/util/cdrom.cpp
View File

File diff suppressed because it is too large Load Diff

45
src/tools/chdman.cpp
View File

@ -17,6 +17,7 @@
#include "hashing.h"
#include "md5.h"
#include "multibyte.h"
#include "osdcore.h"
#include "path.h"
#include "strformat.h"
#include "vbiparse.h"
@ -71,6 +72,9 @@ constexpr int MODE_NORMAL = 0;
constexpr int MODE_CUEBIN = 1;
constexpr int MODE_GDI = 2;
// osd printf verbosity
constexpr bool OSD_PRINTF_VERBOSE = false;
// command modifier
#define REQUIRED "~"
@ -157,6 +161,46 @@ static void do_list_templates(parameters_map &params);
// TYPE DEFINITIONS
//**************************************************************************
// Allow chdman to show osd_printf_X messages
class chdman_osd_output : public osd_output
{
public:
chdman_osd_output() {
osd_output::push(this);
}
~chdman_osd_output() {
osd_output::pop(this);
}
void output_callback(osd_output_channel channel, const util::format_argument_pack<char> &args);
};
void chdman_osd_output::output_callback(osd_output_channel channel, const util::format_argument_pack<char> &args)
{
switch (channel)
{
case OSD_OUTPUT_CHANNEL_ERROR:
case OSD_OUTPUT_CHANNEL_WARNING:
util::stream_format(std::cerr, args);
break;
case OSD_OUTPUT_CHANNEL_INFO:
case OSD_OUTPUT_CHANNEL_LOG:
util::stream_format(std::cout, args);
break;
case OSD_OUTPUT_CHANNEL_VERBOSE:
if (OSD_PRINTF_VERBOSE) util::stream_format(std::cout, args);
break;
case OSD_OUTPUT_CHANNEL_DEBUG:
#ifdef MAME_DEBUG
util::stream_format(std::cout, args);
#endif
break;
default:
break;
}
}
// ======================> option_description
struct option_description
@ -3354,6 +3398,7 @@ static void do_list_templates(parameters_map &params)
int CLIB_DECL main(int argc, char *argv[])
{
const std::vector<std::string> args = osd_get_command_line(argc, argv);
chdman_osd_output osdoutput;
// print the header
extern const char build_version[];