diff options
author | 2016-03-01 06:45:41 +1100 | |
---|---|---|
committer | 2016-03-01 06:52:36 +1100 | |
commit | a830ea76270b7894a03922a172d58bfaefbc827f (patch) | |
tree | 01d929c08c8fa3e66285a3130004d4aa5d31e393 /src/emu/ui/ui.cpp | |
parent | b2fc583ed75b19321849fcd4fec518e2b719294b (diff) |
* Support *n conversion in stream_format/string_format
* Make stream_format return characters printed
* Add iostreams with std::vector storage
* Move to type-safe templates for logerror and popmessage
* Remove now-unnecessary I64FMT from calls to logerror/popmessage
* Put some lib/util stuff in util:: namespace
* Some fixes to Japanese translation
Diffstat (limited to 'src/emu/ui/ui.cpp')
-rw-r--r-- | src/emu/ui/ui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index d3501bfbe42..4104ff88308 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -1189,7 +1189,7 @@ std::string &ui_manager::game_info_astring(std::string &str) std::ostringstream buf; // print description, manufacturer, and CPU: - stream_format(buf, _("%1$s\n%2$s %3$s\nDriver: %4$s\n\nCPU:\n"), + util::stream_format(buf, _("%1$s\n%2$s %3$s\nDriver: %4$s\n\nCPU:\n"), machine().system().description, machine().system().year, machine().system().manufacturer, @@ -1218,7 +1218,7 @@ std::string &ui_manager::game_info_astring(std::string &str) // if more than one, prepend a #x in front of the CPU name // display clock in kHz or MHz - stream_format(buf, + util::stream_format(buf, (count > 1) ? "%1$d" UTF8_MULTIPLY "%2$s %3$d.%4$0*5$d%6$s\n" : "%2$s %3$d.%4$0*5$d%6$s\n", count, name, @@ -1255,7 +1255,7 @@ std::string &ui_manager::game_info_astring(std::string &str) // if more than one, prepend a #x in front of the CPU name // display clock in kHz or MHz int clock = sound->device().clock(); - stream_format(buf, + util::stream_format(buf, (count > 1) ? ((clock != 0) ? "%1$d" UTF8_MULTIPLY "%2$s %3$d.%4$0*5$d%6$s\n" : "%1$d" UTF8_MULTIPLY "%2$s\n") : ((clock != 0) ? "%2$s %3$d.%4$0*5$d%6$s\n" : "%2$s\n"), @@ -1289,7 +1289,7 @@ std::string &ui_manager::game_info_astring(std::string &str) ATTOSECONDS_TO_HZ(screen->frame_period().attoseconds())); } - stream_format(buf, + util::stream_format(buf, (scrcount > 1) ? _("%1$s: %2$s\n") : _("%2$s\n"), slider_get_screen_desc(*screen), detail); } |