diff --git a/plugins/spu2-x/src/Windows/Config.cpp b/plugins/spu2-x/src/Windows/Config.cpp index 21d4dbf40d..7d006235ed 100644 --- a/plugins/spu2-x/src/Windows/Config.cpp +++ b/plugins/spu2-x/src/Windows/Config.cpp @@ -220,6 +220,7 @@ void CheckOutputModule(HWND window) EnableWindow(GetDlgItem(window, IDC_OUTCONF), IsConfigurable); EnableWindow(GetDlgItem(window, IDC_SPEAKERS), AudioExpansion); + EnableWindow(GetDlgItem(window, IDC_SPEAKERS_TEXT), AudioExpansion); } BOOL CALLBACK ConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) diff --git a/plugins/spu2-x/src/Windows/Spu2-X.rc b/plugins/spu2-x/src/Windows/Spu2-X.rc index fa92373b62..da231dcc41 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.rc +++ b/plugins/spu2-x/src/Windows/Spu2-X.rc @@ -24,41 +24,41 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog // -IDD_CONFIG DIALOGEX 0, 0, 319, 302 +IDD_CONFIG DIALOGEX 0, 0, 310, 280 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "SPU2-X Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - PUSHBUTTON "OK",IDOK,200,276,54,15,NOT WS_TABSTOP - PUSHBUTTON "Cancel",IDCANCEL,259,276,54,15,NOT WS_TABSTOP - GROUPBOX "Mixing Settings",IDC_STATIC,6,5,130,115 - GROUPBOX "Output Settings",IDC_STATIC,142,0,172,268 - COMBOBOX IDC_OUTPUT,154,26,126,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Configure...",IDC_OUTCONF,236,40,54,12 - COMBOBOX IDC_INTERPOLATE,14,26,114,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Slider2",IDC_LATENCY_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,166,94,116,10 - CONTROL "Use a Winamp DSP plugin",IDC_DSP_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,223,126,11 - CHECKBOX "Disable Effects Processing",IDC_EFFECTS_DISABLE,14,47,112,10 - LTEXT "Latency:",IDC_STATIC,189,84,29,8,NOT WS_GROUP - LTEXT "Interpolation:",IDC_STATIC,12,16,55,10,NOT WS_GROUP - LTEXT "Module:",IDC_STATIC,161,16,50,9,NOT WS_GROUP - LTEXT "(speedup!) Skips reverb effects processing, but won't sound as good in most games.",IDC_STATIC,26,60,104,36 - LTEXT "(currently requires manual configuration via the ini file)",IDC_STATIC,162,236,146,20 - CTEXT "100 ms (avg)",IDC_LATENCY_LABEL,224,84,58,9 - CONTROL 116,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,213,119,55,WS_EX_CLIENTEDGE - PUSHBUTTON "Advanced...",IDC_OPEN_CONFIG_SOUNDTOUCH,219,149,84,12 - PUSHBUTTON "Configure Debug Options...",IDC_OPEN_CONFIG_DEBUG,14,167,108,14 - CHECKBOX "Enable Debug Options",IDC_DEBUG_ENABLE,14,153,104,10,NOT WS_TABSTOP - GROUPBOX "",IDC_STATIC,6,143,129,46 - LTEXT "Audio Expansion Mode:",IDC_STATIC,161,176,135,9,NOT WS_GROUP - COMBOBOX IDC_SPEAKERS,163,185,135,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Synchronizing Mode:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,161,116,131,8 - COMBOBOX IDC_SYNCHMODE,163,125,134,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Volume:",IDC_STATIC,192,59,26,8,NOT WS_GROUP - CTEXT "100%",IDC_VOLUME_LABEL,224,59,58,9 - CONTROL "",IDC_VOLUME_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,166,69,116,10 - CONTROL "Use the de-alias filter",IDC_DEALIASFILTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,92,112,10 - LTEXT "(overemphasizes the highs)",IDC_STATIC,26,104,100,12,NOT WS_GROUP + PUSHBUTTON "OK",IDOK,101,258,50,14,NOT WS_TABSTOP + PUSHBUTTON "Cancel",IDCANCEL,157,258,50,14,NOT WS_TABSTOP + GROUPBOX "Mixing Settings",IDC_STATIC,6,5,145,115 + LTEXT "Interpolation:",IDC_STATIC,12,16,61,10,NOT WS_GROUP + COMBOBOX IDC_INTERPOLATE,14,26,129,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CHECKBOX "Disable Effects Processing",IDC_EFFECTS_DISABLE,14,47,126,10 + LTEXT "(speedup!) Skips reverb effects processing, but won't sound as good in most games.",IDC_STATIC,26,59,110,36 + CONTROL "Use the de-alias filter",IDC_DEALIASFILTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,92,126,10 + LTEXT "(overemphasizes the highs)",IDC_STATIC,26,104,114,12,NOT WS_GROUP + GROUPBOX "",IDC_STATIC,6,133,145,45 + CHECKBOX "Enable Debug Options",IDC_DEBUG_ENABLE,14,145,118,10,NOT WS_TABSTOP + PUSHBUTTON "Configure...",IDC_OPEN_CONFIG_DEBUG,14,157,52,13 + CONTROL 116,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,195,145,55,WS_EX_CLIENTEDGE + GROUPBOX "Output Settings",IDC_STATIC,157,5,145,245 + LTEXT "Module:",IDC_STATIC,163,16,50,9,NOT WS_GROUP + COMBOBOX IDC_OUTPUT,165,26,129,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Configure...",IDC_OUTCONF,165,42,52,13 + LTEXT "Volume:",IDC_STATIC,192,61,26,8,NOT WS_GROUP + CTEXT "100%",IDC_VOLUME_LABEL,226,61,58,9 + CONTROL "",IDC_VOLUME_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,165,72,129,10 + LTEXT "Latency:",IDC_STATIC,190,86,29,8,NOT WS_GROUP + CTEXT "100 ms (avg)",IDC_LATENCY_LABEL,227,86,58,9 + CONTROL "Slider2",IDC_LATENCY_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,165,96,129,10 + CONTROL "Synchronizing Mode:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,163,116,133,8 + COMBOBOX IDC_SYNCHMODE,165,126,129,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Advanced...",IDC_OPEN_CONFIG_SOUNDTOUCH,165,142,52,13 + LTEXT "Audio Expansion Mode:",IDC_SPEAKERS_TEXT,163,162,137,10,NOT WS_GROUP + COMBOBOX IDC_SPEAKERS,165,172,129,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Use a Winamp DSP plugin",IDC_DSP_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,205,129,11 + LTEXT "(currently requires manual configuration via the ini file)",IDC_STATIC,177,217,100,20 END IDD_DEBUG DIALOGEX 0, 0, 303, 473 diff --git a/plugins/spu2-x/src/Windows/resource.h b/plugins/spu2-x/src/Windows/resource.h index 8f4c4a2ad1..17580e421c 100644 --- a/plugins/spu2-x/src/Windows/resource.h +++ b/plugins/spu2-x/src/Windows/resource.h @@ -25,6 +25,7 @@ #define IDC_OUTPUT 1013 #define IDC_BUFFERS_SLIDER 1014 #define IDC_SPEAKERS 1015 +#define IDC_SPEAKERS_TEXT 1016 #define IDC_MSGKEY 1020 #define IDC_MSGDMA 1021 #define IDC_MSGADMA 1022