diff --git a/win32/wlanguage.h b/win32/wlanguage.h index 823e6ee62..ef6a07b50 100644 --- a/win32/wlanguage.h +++ b/win32/wlanguage.h @@ -309,6 +309,29 @@ Nintendo is a trademark.") #define EMUSET_LABEL_STURBO TEXT("Skip Rendering") #define EMUSET_LABEL_STURBO_TEXT TEXT("frames in fast-forward mode") +//Sound Settings +#define SNDSET_VOLUME_REGULAR TEXT("Adjust the volume of the playback.") +#define SNDSET_VOLUME_TURBO TEXT("Adjust the volume of the playback that occurs when fast-forwarding the program.") +#define SNDSET_OUTPUT_DEVICE TEXT("Set the device through which to output sound.") +#define SNDSET_RATE TEXT("Adjust the sample rate for output. Higher rates generally result in an improved sound quality.") +#define SNDSET_INRATE TEXT("For each 'Input rate' samples generated by the SNES, 'Playback rate' samples will produced. If you experience crackling you can try to lower this setting.") +#define SNDSET_DYNRATECONTROL TEXT("Try to dynamically adjust the input rate to never overflow or underflow the sound buffer.") + +//Display Settings + +#define DSPSET_OUTPUTMETHOD TEXT("Select the method by which to display output") +#define DSPSET_FULLSCREEN TEXT("Toggle between fullscreen and windowed mode") +#define DSPSET_FULLSCREEN_ON_OPEN TEXT("Switch to fullscreen on loading a ROM file") +#define DSPSET_EMUFULLSCREEN TEXT("Emulate fullscreen by creating a window that spans the entire screen when going fullscreen") +#define DSPSET_STRETCH TEXT("Scale the image to window") +#define DSPSET_AUTOFRAME TEXT("Try to achieve 50/60 fps by limiting the speed and skipping at most 'max skipped frames'") +#define DSPSET_FIXEDSKIP TEXT("Always skip a fixed number of frames - no speed limit") +#define DSPSET_HIRES TEXT("Support the hi-res mode that a few games use, otherwise render them in low-res") +#define DSPSET_HEIGHT_EXTEND TEXT("Display an extra 15 pixels at the bottom, which few games use. Also increases AVI output size from 256x224 to 256x240") +#define DSPSET_MESSAGES_IN_IMAGE TEXT("Draw text inside the SNES image (will get into AVIs, screenshots, and filters)") +#define DSPSET_MESSAGES_SCALE TEXT("Try to scale messages with EPX instead of Simple, only works for 2x and 3x and when displaying after filters") + + //Netplay Options #define NPOPT_TITLE TEXT("Netplay Options") diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index b1f0e2dd4..332810b0e 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -4414,11 +4414,15 @@ INT_PTR CALLBACK DlgSoundConf(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) prevDriver = GUI.SoundDriver; - // FIXME: these strings should come from wlanguage.h - - CreateToolTip(IDC_INRATEEDIT, hDlg, TEXT("For each 'Input rate' samples generated by the SNES, 'Playback rate' samples will produced. If you experience crackling you can try to lower this setting.")); - CreateToolTip(IDC_INRATE, hDlg, TEXT("For each 'Input rate' samples generated by the SNES, 'Playback rate' samples will produced. If you experience crackling you can try to lower this setting.")); - CreateToolTip(IDC_DYNRATECONTROL, hDlg, TEXT("Try to dynamically adjust the input rate to never overflow or underflow the sound buffer.")); + CreateToolTip(IDC_SLIDER_VOLUME_REGULAR, hDlg, SNDSET_VOLUME_REGULAR); + CreateToolTip(IDC_EDIT_VOLUME_REGULAR, hDlg, SNDSET_VOLUME_REGULAR); + CreateToolTip(IDC_SLIDER_VOLUME_TURBO, hDlg, SNDSET_VOLUME_TURBO); + CreateToolTip(IDC_EDIT_VOLUME_TURBO, hDlg, SNDSET_VOLUME_TURBO); + CreateToolTip(IDC_OUTPUT_DEVICE, hDlg, SNDSET_OUTPUT_DEVICE); + CreateToolTip(IDC_RATE, hDlg, SNDSET_RATE); + CreateToolTip(IDC_INRATEEDIT, hDlg, SNDSET_INRATE); + CreateToolTip(IDC_INRATE, hDlg, SNDSET_INRATE); + CreateToolTip(IDC_DYNRATECONTROL, hDlg, SNDSET_DYNRATECONTROL); HWND output_dropdown = GetDlgItem(hDlg, IDC_OUTPUT_DEVICE); UpdateAudioDeviceDropdown(output_dropdown); @@ -7546,15 +7550,19 @@ INT_PTR CALLBACK DlgFunky(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { WinRefreshDisplay(); - CreateToolTip(IDC_EMUFULLSCREEN, hDlg, TEXT("Emulate fullscreen by creating a window that spans the entire screen when going fullscreen")); - CreateToolTip(IDC_AUTOFRAME, hDlg, TEXT("Try to achieve 50/60 fps by limiting the speed and skipping at most 'max skipped frames'")); - CreateToolTip(IDC_MAXSKIP, hDlg, TEXT("Try to achieve 50/60 fps by limiting the speed and skipping at most 'max skipped frames'")); - CreateToolTip(IDC_FIXEDSKIP, hDlg, TEXT("Always skip a fixed number of frames - no speed limit")); - CreateToolTip(IDC_SKIPCOUNT, hDlg, TEXT("Always skip a fixed number of frames - no speed limit")); - CreateToolTip(IDC_HIRES, hDlg, TEXT("Support the hi-res mode that a few games use, otherwise render them in low-res")); - CreateToolTip(IDC_HEIGHT_EXTEND, hDlg, TEXT("Display an extra 15 pixels at the bottom, which few games use. Also increases AVI output size from 256x224 to 256x240")); - CreateToolTip(IDC_MESSAGES_IN_IMAGE, hDlg, TEXT("Draw text inside the SNES image (will get into AVIs, screenshots, and filters)")); - CreateToolTip(IDC_MESSAGES_SCALE, hDlg, TEXT("Try to scale messages with EPX instead of Simple, only works for 2x and 3x and when displaying after filters")); + CreateToolTip(IDC_OUTPUTMETHOD, hDlg, DSPSET_OUTPUTMETHOD); + CreateToolTip(IDC_FULLSCREEN, hDlg, DSPSET_FULLSCREEN); + CreateToolTip(IDC_FULLSCREEN_ON_OPEN, hDlg, DSPSET_FULLSCREEN_ON_OPEN); + CreateToolTip(IDC_EMUFULLSCREEN, hDlg, DSPSET_EMUFULLSCREEN); + CreateToolTip(IDC_STRETCH, hDlg, DSPSET_STRETCH); + CreateToolTip(IDC_AUTOFRAME, hDlg, DSPSET_AUTOFRAME); + CreateToolTip(IDC_MAXSKIP, hDlg, DSPSET_AUTOFRAME); + CreateToolTip(IDC_FIXEDSKIP, hDlg, DSPSET_FIXEDSKIP); + CreateToolTip(IDC_SKIPCOUNT, hDlg, DSPSET_FIXEDSKIP); + CreateToolTip(IDC_HIRES, hDlg, DSPSET_HIRES); + CreateToolTip(IDC_HEIGHT_EXTEND, hDlg, DSPSET_HEIGHT_EXTEND); + CreateToolTip(IDC_MESSAGES_IN_IMAGE, hDlg, DSPSET_MESSAGES_IN_IMAGE); + CreateToolTip(IDC_MESSAGES_SCALE, hDlg, DSPSET_MESSAGES_SCALE); prevOutputMethod = GUI.outputMethod; prevScale = GUI.Scale;