add sound API selection

This commit is contained in:
Chris Danford
2005-10-03 23:49:14 +00:00
parent 2a188c4ddd
commit f02877b54f
4 changed files with 62 additions and 36 deletions
+14 -2
View File
@@ -68,7 +68,13 @@ BOOL ChangeGameSettings::OnInitDialog()
sValue = ""; sValue = "";
ini.GetValue( "Options", "SoundDrivers", sValue ); ini.GetValue( "Options", "SoundDrivers", sValue );
if( sValue.CompareNoCase("null")==0 ) if( sValue.CompareNoCase("DirectSound")==0 )
CheckDlgButton( IDC_RADIO_SOUND_DIRECTSOUND_HARDWARE, BST_CHECKED );
else if( sValue.CompareNoCase("DirectSound-sw")==0 )
CheckDlgButton( IDC_RADIO_SOUND_DIRECTSOUND_SOFTWARE, BST_CHECKED );
else if( sValue.CompareNoCase("WaveOut")==0 )
CheckDlgButton( IDC_RADIO_SOUND_WAVE_OUT, BST_CHECKED );
else if( sValue.CompareNoCase("null")==0 )
CheckDlgButton( IDC_RADIO_SOUND_NULL, BST_CHECKED ); CheckDlgButton( IDC_RADIO_SOUND_NULL, BST_CHECKED );
else else
CheckDlgButton( IDC_RADIO_SOUND_DEFAULT, BST_CHECKED ); CheckDlgButton( IDC_RADIO_SOUND_DEFAULT, BST_CHECKED );
@@ -107,7 +113,13 @@ void ChangeGameSettings::OnOK()
ini.SetValue( "Options", "VideoRenderers", "" ); ini.SetValue( "Options", "VideoRenderers", "" );
if( BST_CHECKED == IsDlgButtonChecked(IDC_RADIO_SOUND_NULL) ) if( BST_CHECKED == IsDlgButtonChecked(IDC_RADIO_SOUND_DIRECTSOUND_HARDWARE) )
ini.SetValue( "Options", "SoundDrivers", "DirectSound" );
else if( BST_CHECKED == IsDlgButtonChecked(IDC_RADIO_SOUND_DIRECTSOUND_SOFTWARE) )
ini.SetValue( "Options", "SoundDrivers", "DirectSound-sw" );
else if( BST_CHECKED == IsDlgButtonChecked(IDC_RADIO_SOUND_WAVE_OUT) )
ini.SetValue( "Options", "SoundDrivers", "WaveOut" );
else if( BST_CHECKED == IsDlgButtonChecked(IDC_RADIO_SOUND_NULL) )
ini.SetValue( "Options", "SoundDrivers", "null" ); ini.SetValue( "Options", "SoundDrivers", "null" );
else else
ini.SetValue( "Options", "SoundDrivers", "" ); ini.SetValue( "Options", "SoundDrivers", "" );
+3
View File
@@ -70,6 +70,9 @@
#define IDC_CHECK_LOG_TO_DISK 1053 #define IDC_CHECK_LOG_TO_DISK 1053
#define IDC_CHECK_SHOW_LOG_WINDOW 1054 #define IDC_CHECK_SHOW_LOG_WINDOW 1054
#define IDC_EDIT_INSTALLATION 1054 #define IDC_EDIT_INSTALLATION 1054
#define IDC_RADIO_SOUND_DIRECTSOUND_SOFTWARE 1055
#define IDC_RADIO_SOUND_DIRECTSOUND_HARDWARE 1056
#define IDC_RADIO_SOUND_WAVE_OUT 1057
// Next default values for new objects // Next default values for new objects
// //
+22 -19
View File
@@ -16,25 +16,25 @@ Resource1=IDR_MAINFRAME
Resource2=IDD_ENTER_STRING Resource2=IDD_ENTER_STRING
Class3=CSMPackageInstallDlg Class3=CSMPackageInstallDlg
Class4=CSmpackageExportDlg Class4=CSmpackageExportDlg
Resource3=IDD_EDIT_METRICS Resource3=IDD_INSTALL
Class5=EnterName Class5=EnterName
Resource4=IDD_EDIT_INSTALLATIONS Resource4=IDD_ENTER_COMMENT
Class6=EditInsallations Class6=EditInsallations
Resource5=IDD_SHOW_COMMENT Resource5=IDD_DIALOG_NAME
Class7=MainMenuDlg Class7=MainMenuDlg
Resource6=IDD_DIALOG_NAME Resource6=IDD_EDIT_METRICS
Class8=ConvertThemeDlg Class8=ConvertThemeDlg
Resource7=IDD_UNINSTALL_OLD_PACKAGES Resource7=IDD_EDIT_INSTALLATIONS
Class9=EditMetricsDlg Class9=EditMetricsDlg
Resource8=IDD_EXPORTER Resource8=IDD_CONVERT_THEME
Resource9=IDD_CONVERT_THEME Resource9=IDD_UNINSTALL_OLD_PACKAGES
Class10=EnterComment Class10=EnterComment
Resource10=IDD_ENTER_COMMENT Resource10=IDD_EXPORTER
Class11=ShowComment Class11=ShowComment
Resource11=IDD_INSTALL Resource11=IDD_MENU
Resource12=IDD_CHANGE_GAME_SETTINGS Resource12=IDD_SHOW_COMMENT
Class12=ChangeGameSettings Class12=ChangeGameSettings
Resource13=IDD_MENU Resource13=IDD_CHANGE_GAME_SETTINGS
[CLS:CSmpackageApp] [CLS:CSmpackageApp]
Type=0 Type=0
@@ -293,20 +293,23 @@ Control6=IDC_STATIC,static,1342308352
[DLG:IDD_CHANGE_GAME_SETTINGS] [DLG:IDD_CHANGE_GAME_SETTINGS]
Type=1 Type=1
Class=ChangeGameSettings Class=ChangeGameSettings
ControlCount=13 ControlCount=16
Control1=IDOK,button,1342242817 Control1=IDOK,button,1342242817
Control2=IDCANCEL,button,1342242816 Control2=IDCANCEL,button,1342242816
Control3=IDC_STATIC,button,1342177287 Control3=IDC_STATIC,button,1342177287
Control4=IDC_RADIO_DEFAULT,button,1342308361 Control4=IDC_RADIO_DEFAULT,button,1342308361
Control5=IDC_RADIO_OPENGL,button,1342177289 Control5=IDC_RADIO_OPENGL,button,1342177289
Control6=IDC_RADIO_DIRECT3D,button,1342177289 Control6=IDC_RADIO_DIRECT3D,button,1342177289
Control7=IDC_STATIC,static,1342308352 Control7=IDC_STATIC,button,1342177287
Control8=IDC_STATIC,button,1342177287 Control8=IDC_RADIO_SOUND_DEFAULT,button,1342308361
Control9=IDC_RADIO_SOUND_DEFAULT,button,1342308361 Control9=IDC_RADIO_SOUND_DIRECTSOUND_HARDWARE,button,1342177289
Control10=IDC_RADIO_SOUND_NULL,button,1342177289 Control10=IDC_RADIO_SOUND_DIRECTSOUND_SOFTWARE,button,1342177289
Control11=IDC_STATIC,button,1342177287 Control11=IDC_RADIO_SOUND_WAVE_OUT,button,1342177289
Control12=IDC_CHECK_LOG_TO_DISK,button,1342242819 Control12=IDC_RADIO_SOUND_NULL,button,1342177289
Control13=IDC_CHECK_SHOW_LOG_WINDOW,button,1342242819 Control13=IDC_STATIC,button,1342177287
Control14=IDC_CHECK_LOG_TO_DISK,button,1342242819
Control15=IDC_CHECK_SHOW_LOG_WINDOW,button,1342242819
Control16=IDC_STATIC,static,1342308352
[CLS:ChangeGameSettings] [CLS:ChangeGameSettings]
Type=0 Type=0
+23 -15
View File
@@ -76,7 +76,7 @@ IDR_MAINFRAME ICON DISCARDABLE "smpackage.ICO"
IDD_INSTALL DIALOGEX 0, 0, 332, 234 IDD_INSTALL DIALOGEX 0, 0, 332, 234
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
CAPTION "Stepmania Package Manager" CAPTION "Stepmania Package Manager"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN BEGIN
EDITTEXT IDC_EDIT_MESSAGE1,7,42,320,45,ES_MULTILINE | EDITTEXT IDC_EDIT_MESSAGE1,7,42,320,45,ES_MULTILINE |
ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT
@@ -158,7 +158,7 @@ END
IDD_MENU DIALOGEX 0, 0, 332, 317 IDD_MENU DIALOGEX 0, 0, 332, 317
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "StepMania Tools Main Menu" CAPTION "StepMania Tools Main Menu"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Exit",IDOK,275,296,50,14 DEFPUSHBUTTON "Exit",IDOK,275,296,50,14
CONTROL 140,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 CONTROL 140,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
@@ -244,7 +244,7 @@ END
IDD_ENTER_COMMENT DIALOGEX 0, 0, 312, 202 IDD_ENTER_COMMENT DIALOGEX 0, 0, 312, 202
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Add A Comment" CAPTION "Add A Comment"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN BEGIN
LTEXT "This message will be displayed before a user installs your package.", LTEXT "This message will be displayed before a user installs your package.",
-1,7,7,219,12 -1,7,7,219,12
@@ -258,7 +258,7 @@ END
IDD_SHOW_COMMENT DIALOGEX 0, 0, 246, 186 IDD_SHOW_COMMENT DIALOGEX 0, 0, 246, 186
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Package Comment" CAPTION "Package Comment"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN BEGIN
EDITTEXT IDC_EDIT,7,7,232,137,ES_MULTILINE | ES_AUTOHSCROLL | EDITTEXT IDC_EDIT,7,7,232,137,ES_MULTILINE | ES_AUTOHSCROLL |
ES_READONLY ES_READONLY
@@ -283,13 +283,13 @@ BEGIN
LTEXT "Delete old packages?",IDC_STATIC,105,119,67,12 LTEXT "Delete old packages?",IDC_STATIC,105,119,67,12
END END
IDD_CHANGE_GAME_SETTINGS DIALOG DISCARDABLE 0, 0, 162, 262 IDD_CHANGE_GAME_SETTINGS DIALOG DISCARDABLE 0, 0, 162, 303
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Change Game Settings" CAPTION "Change Game Settings"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,49,240,50,14 DEFPUSHBUTTON "OK",IDOK,49,281,50,14
PUSHBUTTON "Cancel",IDCANCEL,104,240,50,14 PUSHBUTTON "Cancel",IDCANCEL,104,281,50,14
GROUPBOX "Graphics API",IDC_STATIC,7,7,147,71 GROUPBOX "Graphics API",IDC_STATIC,7,7,147,71
CONTROL "Default (recommended)",IDC_RADIO_DEFAULT,"Button", CONTROL "Default (recommended)",IDC_RADIO_DEFAULT,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,25,24,105,12 BS_AUTORADIOBUTTON | WS_GROUP,25,24,105,12
@@ -297,18 +297,26 @@ BEGIN
40,105,12 40,105,12
CONTROL "Direct3D",IDC_RADIO_DIRECT3D,"Button", CONTROL "Direct3D",IDC_RADIO_DIRECT3D,"Button",
BS_AUTORADIOBUTTON,25,56,105,12 BS_AUTORADIOBUTTON,25,56,105,12
LTEXT "Tip: Change these only if you experience problems when using the default settings.", GROUPBOX "Sound API",IDC_STATIC,7,83,147,103
IDC_STATIC,7,205,147,27
GROUPBOX "Sound API",IDC_STATIC,7,83,147,53
CONTROL "Default (recommended)",IDC_RADIO_SOUND_DEFAULT,"Button", CONTROL "Default (recommended)",IDC_RADIO_SOUND_DEFAULT,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,25,99,105,12 BS_AUTORADIOBUTTON | WS_GROUP,25,99,105,12
CONTROL "Null (no sound)",IDC_RADIO_SOUND_NULL,"Button", CONTROL "DirectSound Hardware",
IDC_RADIO_SOUND_DIRECTSOUND_HARDWARE,"Button",
BS_AUTORADIOBUTTON,25,115,105,12 BS_AUTORADIOBUTTON,25,115,105,12
GROUPBOX "Logging",IDC_STATIC,7,143,147,53 CONTROL "DirectSound Software",
IDC_RADIO_SOUND_DIRECTSOUND_SOFTWARE,"Button",
BS_AUTORADIOBUTTON,25,131,105,12
CONTROL "Wave Out",IDC_RADIO_SOUND_WAVE_OUT,"Button",
BS_AUTORADIOBUTTON,25,147,105,12
CONTROL "Null (no sound)",IDC_RADIO_SOUND_NULL,"Button",
BS_AUTORADIOBUTTON,25,163,105,12
GROUPBOX "Logging",IDC_STATIC,7,191,147,53
CONTROL "Log to Disk",IDC_CHECK_LOG_TO_DISK,"Button", CONTROL "Log to Disk",IDC_CHECK_LOG_TO_DISK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,26,160,106,10 BS_AUTOCHECKBOX | WS_TABSTOP,26,208,106,10
CONTROL "Show Log Window",IDC_CHECK_SHOW_LOG_WINDOW,"Button", CONTROL "Show Log Window",IDC_CHECK_SHOW_LOG_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,26,176,106,10 BS_AUTOCHECKBOX | WS_TABSTOP,26,224,106,10
LTEXT "Tip: Change these only if you experience problems when using the default settings.",
IDC_STATIC,7,250,147,27
END END
@@ -446,7 +454,7 @@ BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 154 RIGHTMARGIN, 154
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 254 BOTTOMMARGIN, 295
END END
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED