From 504be0917badba8adf96fe50ef30f5adf94c0327 Mon Sep 17 00:00:00 2001 From: Brandon Wright Date: Tue, 19 Feb 2019 14:26:48 -0600 Subject: [PATCH] win32: Readd version to title string. --- apu/apu.cpp | 9 +++------ win32/wsnes9x.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/apu/apu.cpp b/apu/apu.cpp index 5d6b6522..c6eb3660 100644 --- a/apu/apu.cpp +++ b/apu/apu.cpp @@ -28,14 +28,12 @@ static const int APU_DENOMINATOR_PAL = 709379; // for use with SoundSync, multiplied by 2, for left and right samples. static const int MINIMUM_BUFFER_SIZE = 550 * 2; -namespace SNES -{ +namespace SNES { #include "bapu/dsp/blargg_endian.h" CPU cpu; } // namespace SNES -namespace spc -{ +namespace spc { static apu_callback callback = NULL; static void *callback_data = NULL; @@ -57,8 +55,7 @@ static uint32 ratio_denominator = APU_DENOMINATOR_NTSC; static double dynamic_rate_multiplier = 1.0; } // namespace spc -namespace msu -{ +namespace msu { // Always 16-bit, Stereo; 1.5x dsp buffer to never overflow static Resampler *resampler = NULL; static std::vector resample_buffer; diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index 3914302b..0711e1ce 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -684,15 +684,15 @@ static void CenterCursor() void S9xRestoreWindowTitle () { - TCHAR buf [100]; + TCHAR buf [1024]; if (Memory.ROMFilename[0]) { - char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1]; - _splitpath(Memory.ROMFilename, drive, dir, def, ext); - _stprintf(buf, TEXT("%s - %s"), (wchar_t *)Utf8ToWide(def), WINDOW_TITLE); + char def[_MAX_FNAME]]; + _splitpath(Memory.ROMFilename, NULL, NULL def, NULL); + _stprintf(buf, TEXT("%s - %s %s"), (wchar_t *)Utf8ToWide(def), WINDOW_TITLE, TEXT(VERSION)); } else - _stprintf(buf, WINDOW_TITLE); + _stprintf(buf, TEXT("%s %s"), WINDOW_TITLE, TEXT(VERSION)); SetWindowText (GUI.hWnd, buf); } @@ -2604,7 +2604,7 @@ BOOL WinInit( HINSTANCE hInstance) #endif TCHAR buf [100]; - _stprintf (buf, WINDOW_TITLE); + _stprintf(buf, TEXT("%s %s"), WINDOW_TITLE, TEXT(VERSION)); DWORD dwExStyle; DWORD dwStyle;