ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win32 - Sound Dialog - more GUI fix up

This commit is contained in:
adelikat 2009-03-15 13:47:12 +00:00
parent a7860bd3ab
commit e42bbace5e
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/drivers/win/res.rc
View File

@ -758,8 +758,8 @@ BEGIN
GROUPBOX "Output/Output Format:",302,10,9,131,93,WS_GROUP GROUPBOX "Output/Output Format:",302,10,9,131,93,WS_GROUP
CONTROL "Sound enabled.",CHECK_SOUND_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,117,12 CONTROL "Sound enabled.",CHECK_SOUND_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,117,12
CONTROL "Force 8-bit sound.",CHECK_SOUND_8BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,38,117,11 CONTROL "Force 8-bit sound.",CHECK_SOUND_8BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,38,117,11
LTEXT "Rate:",65461,17,81,34,10 LTEXT "Rate:",65461,17,81,22,10
LTEXT "Hz",65460,115,81,15,9 LTEXT "Hz",65460,108,81,15,9
GROUPBOX "Buffering:",127,150,9,131,93,WS_GROUP GROUPBOX "Buffering:",127,150,9,131,93,WS_GROUP
CONTROL "Use Global Focus",124,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,22,100,12 CONTROL "Use Global Focus",124,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,22,100,12
CTEXT "Sound Latency",65459,162,50,107,8 CTEXT "Sound Latency",65459,162,50,107,8
@ -769,9 +769,9 @@ BEGIN
LTEXT "15 ms",65458,160,87,20,8 LTEXT "15 ms",65458,160,87,20,8
LTEXT "200 ms",65457,250,87,25,8 LTEXT "200 ms",65457,250,87,25,8
LTEXT "ms",65456,211,60,19,8 LTEXT "ms",65456,211,60,19,8
COMBOBOX COMBO_SOUND_RATE,57,78,53,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX COMBO_SOUND_RATE,50,78,53,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX COMBO_SOUND_QUALITY,57,54,77,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX COMBO_SOUND_QUALITY,50,54,67,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Quality:",65455,17,54,35,10 LTEXT "Quality:",65455,17,54,27,10
CONTROL "Mute frame advance.",CHECK_SOUND_MUTEFA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,110,87,11 CONTROL "Mute frame advance.",CHECK_SOUND_MUTEFA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,110,87,11
CONTROL "Mute Turbo.",CHECK_SOUND_MUTETURBO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,111,55,10 CONTROL "Mute Turbo.",CHECK_SOUND_MUTETURBO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,111,55,10
GROUPBOX "Triangle",131,70,142,44,93,WS_GROUP GROUPBOX "Triangle",131,70,142,44,93,WS_GROUP
@ -787,6 +787,7 @@ BEGIN
GROUPBOX "Volume Control",IDC_STATIC,10,127,314,127 GROUPBOX "Volume Control",IDC_STATIC,10,127,314,127
PUSHBUTTON "Restore defaults",IDC_SOUND_RESTOREDEFAULTVOL,19,238,56,11 PUSHBUTTON "Restore defaults",IDC_SOUND_RESTOREDEFAULTVOL,19,238,56,11
LTEXT "",ID_SOUND_TRITOP,76,135,38,8 LTEXT "",ID_SOUND_TRITOP,76,135,38,8
LTEXT "",ID_SOUND_QUALITYNOTIFY,170,133,144,8
END END
TIMINGCONFIG DIALOGEX 23, 157, 203, 60 TIMINGCONFIG DIALOGEX 23, 157, 203, 60

3
src/drivers/win/resource.h
View File

@ -405,6 +405,7 @@
#define IDC_SOUNDS_RESTOREDEFAULTS 1199 #define IDC_SOUNDS_RESTOREDEFAULTS 1199
#define BTN_CANCELED 1200 #define BTN_CANCELED 1200
#define ID_SOUND_TRITOP 1201 #define ID_SOUND_TRITOP 1201
#define ID_SOUND_QUALITYNOTIFY 1202
#define MENU_NETWORK 40040 #define MENU_NETWORK 40040
#define MENU_PALETTE 40041 #define MENU_PALETTE 40041
#define MENU_SOUND 40042 #define MENU_SOUND 40042
@ -688,7 +689,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 125 #define _APS_NEXT_RESOURCE_VALUE 125
#define _APS_NEXT_COMMAND_VALUE 40353 #define _APS_NEXT_COMMAND_VALUE 40353
#define _APS_NEXT_CONTROL_VALUE 1202 #define _APS_NEXT_CONTROL_VALUE 1203
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif

10
src/drivers/win/sound.cpp
View File

@ -433,6 +433,9 @@ static void UpdateSD(HWND hwndDlg)
EnableWindow(GetDlgItem(hwndDlg,133),FALSE); EnableWindow(GetDlgItem(hwndDlg,133),FALSE);
EnableWindow(GetDlgItem(hwndDlg,134),FALSE); EnableWindow(GetDlgItem(hwndDlg,134),FALSE);
EnableWindow(GetDlgItem(hwndDlg,135),FALSE); EnableWindow(GetDlgItem(hwndDlg,135),FALSE);
//Static text boxes in volume group box
EnableWindow(GetDlgItem(hwndDlg,ID_SOUND_QUALITYNOTIFY),FALSE);
EnableWindow(GetDlgItem(hwndDlg,ID_SOUND_TRITOP),FALSE);
} }
else else
{ {
@ -457,6 +460,9 @@ static void UpdateSD(HWND hwndDlg)
EnableWindow(GetDlgItem(hwndDlg,133),TRUE); EnableWindow(GetDlgItem(hwndDlg,133),TRUE);
EnableWindow(GetDlgItem(hwndDlg,134),TRUE); EnableWindow(GetDlgItem(hwndDlg,134),TRUE);
EnableWindow(GetDlgItem(hwndDlg,135),TRUE); EnableWindow(GetDlgItem(hwndDlg,135),TRUE);
//Static text boxes in volume group box
EnableWindow(GetDlgItem(hwndDlg,ID_SOUND_QUALITYNOTIFY),TRUE);
EnableWindow(GetDlgItem(hwndDlg,ID_SOUND_TRITOP),TRUE);
} }
UpdateSoundChannelQualityMode(hwndDlg); UpdateSoundChannelQualityMode(hwndDlg);
@ -728,6 +734,8 @@ void UpdateSoundChannelQualityMode(HWND hwndDlg)
SetDlgItemText(hwndDlg, 133, "Square 2"); SetDlgItemText(hwndDlg, 133, "Square 2");
SetDlgItemText(hwndDlg, 134, "Noise"); SetDlgItemText(hwndDlg, 134, "Noise");
SetDlgItemText(hwndDlg, 135, "PCM"); SetDlgItemText(hwndDlg, 135, "PCM");
//Set quality message off
SetDlgItemText(hwndDlg, ID_SOUND_QUALITYNOTIFY, "");
} }
else //If low else //If low
{ {
@ -746,6 +754,8 @@ void UpdateSoundChannelQualityMode(HWND hwndDlg)
SetDlgItemText(hwndDlg, 133, "Disabled"); //Set Square 2 to disabled SetDlgItemText(hwndDlg, 133, "Disabled"); //Set Square 2 to disabled
SetDlgItemText(hwndDlg, 134, "Disabled"); //Set Noise to disabled SetDlgItemText(hwndDlg, 134, "Disabled"); //Set Noise to disabled
SetDlgItemText(hwndDlg, 135, "Disabled"); //Set PCM to disabled SetDlgItemText(hwndDlg, 135, "Disabled"); //Set PCM to disabled
//Set quality message on
SetDlgItemText(hwndDlg, ID_SOUND_QUALITYNOTIFY, "(To enable these, use a higher quality setting)");
} }
return; return;