diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp index 0a75aecaf7..ce7059ac36 100644 --- a/plugins/spu2-x/src/Linux/Config.cpp +++ b/plugins/spu2-x/src/Linux/Config.cpp @@ -287,24 +287,24 @@ void DisplayDialog() int_label = gtk_label_new("Interpolation:"); int_box = gtk_combo_box_text_new(); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "0 - Nearest (fastest/bad quality)"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "1 - Linear (simple/okay sound)"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "2 - Cubic (artificial highs)"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "3 - Hermite (better highs)"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "0 - Nearest (Fastest/bad quality)"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "1 - Linear (Simple/okay sound)"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "2 - Cubic (Artificial highs)"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "3 - Hermite (Better highs)"); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(int_box), "4 - Catmull-Rom (PS2-like/slow)"); gtk_combo_box_set_active(GTK_COMBO_BOX(int_box), Interpolation); effects_check = gtk_check_button_new_with_label("Disable Effects Processing"); - dealias_filter = gtk_check_button_new_with_label("Use the de-alias filter (overemphasizes the highs)"); + dealias_filter = gtk_check_button_new_with_label("Use the de-alias filter (Overemphasizes the highs)"); debug_check = gtk_check_button_new_with_label("Enable Debug Options"); - debug_button = gtk_button_new_with_label("Debug..."); + debug_button = gtk_button_new_with_label("Configure..."); mod_label = gtk_label_new("Module:"); mod_box = gtk_combo_box_text_new(); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "0 - No Sound (emulate SPU2 only)"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "1 - PortAudio (cross-platform)"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "2 - SDL Audio (recommended for PulseAudio)"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "0 - No Sound (Emulate SPU2 only)"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "1 - PortAudio (Cross-platform)"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "2 - SDL Audio (Recommended for PulseAudio)"); //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "3 - Alsa (probably doesn't work)"); gtk_combo_box_set_active(GTK_COMBO_BOX(mod_box), OutputModule); diff --git a/plugins/spu2-x/src/SndOut_Portaudio.cpp b/plugins/spu2-x/src/SndOut_Portaudio.cpp index c279266386..818ec4e415 100644 --- a/plugins/spu2-x/src/SndOut_Portaudio.cpp +++ b/plugins/spu2-x/src/SndOut_Portaudio.cpp @@ -544,7 +544,7 @@ public: const wchar_t *GetLongName() const { - return L"Portaudio (crossplatform)"; + return L"PortAudio (Cross-platform)"; } void ReadSettings() diff --git a/plugins/spu2-x/src/Windows/Config.cpp b/plugins/spu2-x/src/Windows/Config.cpp index 7d006235ed..8cc82e1351 100644 --- a/plugins/spu2-x/src/Windows/Config.cpp +++ b/plugins/spu2-x/src/Windows/Config.cpp @@ -234,10 +234,10 @@ BOOL CALLBACK ConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_INITDIALOG: { SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_RESETCONTENT, 0, 0); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"0 - Nearest (fastest/bad quality)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"1 - Linear (simple/okay sound)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"2 - Cubic (artificial highs)"); - SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"3 - Hermite (better highs)"); + SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"0 - Nearest (Fastest/bad quality)"); + SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"1 - Linear (Simple/okay sound)"); + SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"2 - Cubic (Artificial highs)"); + SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"3 - Hermite (Better highs)"); SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_ADDSTRING, 0, (LPARAM)L"4 - Catmull-Rom (PS2-like/slow)"); SendDialogMsg(hWnd, IDC_INTERPOLATE, CB_SETCURSEL, Interpolation, 0); @@ -248,7 +248,7 @@ BOOL CALLBACK ConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) SendDialogMsg(hWnd, IDC_SYNCHMODE, CB_SETCURSEL, SynchMode, 0); SendDialogMsg(hWnd, IDC_SPEAKERS, CB_RESETCONTENT, 0, 0); - SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Stereo (none, default)"); + SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Stereo (None, Default)"); SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Quadrafonic"); SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Surround 5.1"); SendDialogMsg(hWnd, IDC_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)L"Surround 7.1"); diff --git a/plugins/spu2-x/src/Windows/SndOut_DSound.cpp b/plugins/spu2-x/src/Windows/SndOut_DSound.cpp index a5b9f22a9c..0804f75662 100644 --- a/plugins/spu2-x/src/Windows/SndOut_DSound.cpp +++ b/plugins/spu2-x/src/Windows/SndOut_DSound.cpp @@ -416,7 +416,7 @@ public: const wchar_t *GetLongName() const { - return L"DirectSound (nice)"; + return L"DirectSound (Nice)"; } void ReadSettings() diff --git a/plugins/spu2-x/src/Windows/SndOut_waveOut.cpp b/plugins/spu2-x/src/Windows/SndOut_waveOut.cpp index b4095a7262..e3025227c7 100644 --- a/plugins/spu2-x/src/Windows/SndOut_waveOut.cpp +++ b/plugins/spu2-x/src/Windows/SndOut_waveOut.cpp @@ -303,7 +303,7 @@ public: const wchar_t *GetLongName() const { - return L"waveOut (Laggy)"; + return L"WaveOut (Laggy)"; } void ReadSettings() diff --git a/plugins/spu2-x/src/Windows/Spu2-X.rc b/plugins/spu2-x/src/Windows/Spu2-X.rc index da231dcc41..740285d1e8 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.rc +++ b/plugins/spu2-x/src/Windows/Spu2-X.rc @@ -74,69 +74,55 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "DirectSound Output Module Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,83,200,50,14 - PUSHBUTTON "Cancel",IDCANCEL,141,200,50,14 - COMBOBOX IDC_DS_DEVICE,4,15,146,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "DirectSound Device",IDC_STATIC,4,3,63,8 - CONTROL "",IDC_BUFFERS_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,38,137,108,10 - LTEXT "Increase the buffer count if you are experiencing loopy or studdery audio even when games run at high FPS.",IDC_STATIC,11,157,169,27 - CTEXT "8 (80 ms latency)",IDC_LATENCY_LABEL,44,123,95,11 - LTEXT "The options above are useful for compatibility with older and/or buggy sound drivers ONLY, and should not be checked unless you experience sound problems (such as crackly audio or silence).",IDC_STATIC,16,68,175,38 - CONTROL "Disable Global Focus",IDC_GLOBALFOCUS_DISABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,4,38,140,10 + DEFPUSHBUTTON "OK",IDOK,45,196,50,14 + PUSHBUTTON "Cancel",IDCANCEL,102,196,50,14 + COMBOBOX IDC_DS_DEVICE,8,13,180,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "DirectSound Device:",IDC_STATIC,6,3,65,8 + CONTROL "",IDC_BUFFERS_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,40,137,108,10 + LTEXT "Increase the buffer count if you are experiencing loopy or studdery audio even when games run at high FPS.",IDC_STATIC,13,157,169,27 + CTEXT "8 (80 ms latency)",IDC_LATENCY_LABEL,46,123,95,11 + LTEXT "The options above are useful for compatibility with older and/or buggy sound drivers ONLY, and should not be checked unless you experience sound problems (such as crackly audio or silence).",IDC_STATIC,18,68,172,38 + CONTROL "Disable Global Focus",IDC_GLOBALFOCUS_DISABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,6,38,140,10 CONTROL "Use a crappy alternate buffering mode",IDC_USE_HARDWARE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,53,140,10 - GROUPBOX "Output Buffers",IDC_STATIC,4,111,185,79 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,53,140,10 + GROUPBOX "Output Buffers",IDC_STATIC,6,111,183,77 END IDD_WAVEOUT DIALOGEX 0, 0, 170, 122 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "waveOut Output Module Settings" +CAPTION "WaveOut Output Module Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,52,104,50,14 - PUSHBUTTON "Cancel",IDCANCEL,115,104,50,14 - COMBOBOX IDC_DS_DEVICE,4,15,161,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "waveOut Device",IDC_STATIC,4,3,54,8 + DEFPUSHBUTTON "OK",IDOK,32,100,50,14 + PUSHBUTTON "Cancel",IDCANCEL,88,100,50,14 + COMBOBOX IDC_DS_DEVICE,6,13,159,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "WaveOut Device:",IDC_STATIC,4,3,60,8 LTEXT "Number of Buffers",IDC_STATIC,4,39,61,11 CONTROL "",IDC_BUFFERS_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,71,48,94,10 LTEXT "Use extra buffers if you are experiencing loopy or studdery audio even when games run at high FPS.",IDC_STATIC,8,66,151,27 CTEXT "8 (80 ms latency)",IDC_LATENCY_LABEL,70,37,95,11 END -// fixme: This dialog doesn't work (was it ever used in the first place?) -IDD_XAUDIO2 DIALOGEX 0, 0, 202, 116 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XAudio2 Output Module Settings" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,88,98,50,14 - PUSHBUTTON "Cancel",IDCANCEL,147,98,50,14 - COMBOBOX IDC_DS_DEVICE,4,15,193,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "XAudio Device",IDC_STATIC,4,3,46,8 - CONTROL "Use Triple Buffering",IDC_XA2_TRIBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,40,109,10 - LTEXT "Increases latency by a few milliseconds. Enable triple buffering you are experiencing loopy or studdery audio even when games run at high FPS.",IDC_STATIC,20,53,175,35 -END - IDD_CONFIG_SOUNDTOUCH DIALOGEX 0, 0, 206, 223 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Soundtouch Advanced Configuration - SPU2-X" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,50,205,50,14 - PUSHBUTTON "Cancel",IDCANCEL,104,205,50,14 + DEFPUSHBUTTON "OK",IDOK,50,201,50,14 + PUSHBUTTON "Cancel",IDCANCEL,106,201,50,14 CTEXT "These are advanced configuration options for fine tuning time stretching behavior. Larger values are better for slowdown, while smaller values are better for speed-up (better than 60fps).\n\nAll options are in milliseconds (ms).",IDC_STATIC,5,5,196,52 CONTROL "",IDC_SEQLEN_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,98,105,10 - CTEXT "Sequence Length",IDC_STATIC,72,88,64,9 - CONTROL "",IDC_SEEKWIN_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,136,105,10 - CTEXT "Seekwindow Size",IDC_STATIC,70,125,66,9 - CONTROL "",IDC_OVERLAP_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,170,105,10 - CTEXT "Overlap",IDC_STATIC,86,162,34,9 - LTEXT "20",IDC_STATIC,50,112,9,8 - LTEXT "100",IDC_STATIC,146,112,13,8 - LTEXT "10",IDC_STATIC,50,149,9,8 - LTEXT "30",IDC_STATIC,146,149,9,8 - LTEXT "5",IDC_STATIC,52,184,8,8 - LTEXT "15",IDC_STATIC,146,184,9,8 + CTEXT "Sequence Length",IDC_STATIC,72,86,64,9 + CONTROL "",IDC_SEEKWIN_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,134,105,10 + CTEXT "Seekwindow Size",IDC_STATIC,70,123,66,9 + CONTROL "",IDC_OVERLAP_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,168,105,10 + CTEXT "Overlap",IDC_STATIC,86,160,34,9 + LTEXT "20",IDC_STATIC,50,110,9,8 + LTEXT "100",IDC_STATIC,146,110,13,8 + LTEXT "10",IDC_STATIC,50,147,9,8 + LTEXT "30",IDC_STATIC,146,147,9,8 + LTEXT "5",IDC_STATIC,52,182,8,8 + LTEXT "15",IDC_STATIC,146,182,9,8 PUSHBUTTON "Reset Defaults",IDC_RESET_DEFAULTS,61,62,82,12 END @@ -145,8 +131,8 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "SPU2-X Debugging Options" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,190,220,46,14 - PUSHBUTTON "Cancel",IDCANCEL,241,220,46,14 + DEFPUSHBUTTON "OK",IDOK,93,217,50,14 + PUSHBUTTON "Cancel",IDCANCEL,149,217,50,14 GROUPBOX "",IDC_STATIC,5,5,135,93 GROUPBOX "Logfile-only Logs",IDC_STATIC,151,5,136,53 GROUPBOX "Dumps (on close)",IDC_STATIC,151,60,135,54 @@ -211,14 +197,6 @@ BEGIN BOTTOMMARGIN, 118 END - IDD_XAUDIO2, DIALOG - BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 197 - TOPMARGIN, 3 - BOTTOMMARGIN, 112 - END - IDD_CONFIG_SOUNDTOUCH, DIALOG BEGIN LEFTMARGIN, 5 @@ -305,16 +283,16 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Portaudio Output Module Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,205,145,50,14 - PUSHBUTTON "Cancel",IDCANCEL,259,145,50,14 - COMBOBOX IDC_PA_HOSTAPI,7,18,95,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Host Api",IDC_STATIC,7,7,28,8 - COMBOBOX IDC_PA_DEVICE,108,18,201,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Device Name",IDC_STATIC,107,7,42,8 + DEFPUSHBUTTON "OK",IDOK,105,144,50,14 + PUSHBUTTON "Cancel",IDCANCEL,161,144,50,14 + COMBOBOX IDC_PA_HOSTAPI,7,17,95,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Host Api:",IDC_STATIC,7,7,29,8 + COMBOBOX IDC_PA_DEVICE,108,17,201,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Device Name:",IDC_STATIC,107,7,45,8 CONTROL "",IDC_LATENCY,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,96,93,155,10 LTEXT "NOTE: Depending on the hardware and drivers, the suggested manual latency might not be used, and portaudio will choose the closest possible value.",IDC_STATIC,12,111,286,19 CTEXT "20ms",IDC_LATENCY_LABEL,264,93,35,11 - GROUPBOX "Output Latency",IDC_STATIC,7,57,302,82 + GROUPBOX "Output Latency",IDC_STATIC,7,57,302,79 CONTROL "Use smallest possible (may cause issues if the actual value is too small)",IDC_MINIMIZE, "Button",BS_AUTORADIOBUTTON | WS_GROUP,12,75,258,10 CONTROL "Use this latency:",IDC_MANUAL,"Button",BS_AUTORADIOBUTTON,12,93,69,10 diff --git a/plugins/spu2-x/src/Windows/resource.h b/plugins/spu2-x/src/Windows/resource.h index 17580e421c..990cd750cd 100644 --- a/plugins/spu2-x/src/Windows/resource.h +++ b/plugins/spu2-x/src/Windows/resource.h @@ -6,7 +6,6 @@ #define IDD_DEBUG 105 #define IDD_DSOUND 106 #define IDD_WAVEOUT 109 -#define IDD_XAUDIO2 111 #define IDB_SPU2X_SMALL 116 #define IDD_CONFIG_SOUNDTOUCH 117 #define IDD_CONFIG_DEBUG 118 @@ -44,7 +43,6 @@ #define IDC_SEEKWIN_SLIDER 1044 #define IDC_OVERLAP_SLIDER 1045 #define IDC_MSG_PUBLIC_BUILD 1048 -#define IDC_XA2_TRIBLE_BUFFER 1050 #define IDC_RESET_DEFAULTS 1057 #define IDC_OPEN_CONFIG_SOUNDTOUCH 1058 #define IDC_OPEN_CONFIG_DEBUG 1059