claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3071 from jriwanek-forks/multi-sound

Browse Source 
Support up to 4 sound cards
This commit is contained in:
Miran Grča
2023-02-02 12:39:54 +01:00
committed by GitHub
parent 63b2f6bb5d 5f04b29e8f
commit a6ca6e3001
56 changed files with 892 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/win/languages/cs-CZ.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Joystick 3..."
#define STR_JOY4 "Joystick 4..."
#define STR_SOUND "Zvuková karta:"
#define STR_SOUND1 "Zvuková karta 1:"
#define STR_SOUND2 "Zvuková karta 2:"
#define STR_SOUND3 "Zvuková karta 3:"
#define STR_SOUND4 "Zvuková karta 4:"
#define STR_MIDI_OUT "MIDI výstup:"
#define STR_MIDI_IN "MIDI vstup:"
#define STR_MPU401 "Samostatný MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Použít zvuk FLOAT32"
#define STR_FM_DRIVER "FM synth driver"
#define STR_FM_DRV_NUKED "Nuked (přesnější)"

8
src/win/languages/de-DE.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Joystick 3..."
#define STR_JOY4 "Joystick 4..."
#define STR_SOUND "Soundkarte:"
#define STR_SOUND1 "Soundkarte 1:"
#define STR_SOUND2 "Soundkarte 2:"
#define STR_SOUND3 "Soundkarte 3:"
#define STR_SOUND4 "Soundkarte 4:"
#define STR_MIDI_OUT "MIDI Out-Gerät:"
#define STR_MIDI_IN "MIDI In-Gerät:"
#define STR_MPU401 "Standalone-MPU-401-Gerät"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "FLOAT32-Wiedergabe benutzen"
#define STR_FM_DRIVER "FM-Synth-Treiber"
#define STR_FM_DRV_NUKED "Nuked (genauer)"

74
src/win/languages/dialogs.rc
View File

@@ -320,58 +320,64 @@ DLG_CFG_SOUND DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, C
STYLE DS_CONTROL | WS_CHILD
FONT FONT_SIZE, FONT_NAME
BEGIN
LTEXT STR_SOUND, IDT_SOUND,
LTEXT STR_SOUND1, IDT_SOUND1,
CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
COMBOBOX IDC_COMBO_SOUND,
COMBOBOX IDC_COMBO_SOUND1,
CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_SND,
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_SND1,
CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
LTEXT STR_MIDI_OUT, IDT_MIDI_OUT,
LTEXT STR_SOUND2, IDT_SOUND2,
CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
COMBOBOX IDC_COMBO_MIDI_OUT,
COMBOBOX IDC_COMBO_SOUND2,
CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_SND2,
CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
LTEXT STR_SOUND3, IDT_SOUND3,
CFG_HMARGIN, 48, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
COMBOBOX IDC_COMBO_SOUND3,
CFG_COMBO_BOX_LEFT, 46, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_SND3,
CFG_COMBO_BTN_LEFT, 45, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
LTEXT STR_SOUND4, IDT_SOUND4,
CFG_HMARGIN, 68, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
COMBOBOX IDC_COMBO_SOUND4,
CFG_COMBO_BOX_LEFT, 66, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_SND4,
CFG_COMBO_BTN_LEFT, 65, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
LTEXT STR_MIDI_OUT, IDT_MIDI_OUT,
CFG_HMARGIN, 88, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
COMBOBOX IDC_COMBO_MIDI_OUT,
CFG_COMBO_BOX_LEFT, 86, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE,
IDC_CONFIGURE_MIDI_OUT,
CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CFG_COMBO_BTN_LEFT, 85, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
LTEXT STR_MIDI_IN, IDT_MIDI_IN,
CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
CFG_HMARGIN, 108, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
COMBOBOX IDC_COMBO_MIDI_IN,
CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
CFG_COMBO_BOX_LEFT, 105, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_MIDI_IN,
CFG_COMBO_BTN_LEFT, 44, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CFG_COMBO_BTN_LEFT, 105, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_MPU401,IDC_CHECK_MPU401,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
CFG_HMARGIN, 66, 199, CFG_CHECKBOX_HEIGHT
CFG_HMARGIN, 126, 199, CFG_CHECKBOX_HEIGHT
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_MPU401,
CFG_COMBO_BTN_LEFT, 64, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CFG_COMBO_BTN_LEFT, 125, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_SSI,IDC_CHECK_SSI,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
CFG_HMARGIN, 84, 95, CFG_CHECKBOX_HEIGHT
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_SSI,
CFG_COMBO_BTN_LEFT, 82, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_CMS,IDC_CHECK_CMS,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
CFG_HMARGIN, 102, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_CMS,
CFG_COMBO_BTN_LEFT, 100, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_GUS,IDC_CHECK_GUS,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
CFG_HMARGIN, 120, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_GUS,
CFG_COMBO_BTN_LEFT, 118, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_FLOAT, IDC_CHECK_FLOAT,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
CFG_HMARGIN, 138, 104, CFG_CHECKBOX_HEIGHT
CFG_HMARGIN, 138, 194, CFG_CHECKBOX_HEIGHT
GROUPBOX STR_FM_DRIVER, IDC_FM_DRIVER,
CFG_HMARGIN, 154, 110, 42
@@ -958,13 +964,13 @@ END
#undef STR_JOY3
#undef STR_JOY4
#undef STR_SOUND
#undef STR_SOUND1
#undef STR_SOUND2
#undef STR_SOUND3
#undef STR_SOUND4
#undef STR_MIDI_OUT
#undef STR_MIDI_IN
#undef STR_MPU401
#undef STR_SSI
#undef STR_CMS
#undef STR_GUS
#undef STR_FLOAT
#undef STR_FM_DRIVER
#undef STR_FM_DRV_NUKED

8
src/win/languages/en-GB.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Joystick 3..."
#define STR_JOY4 "Joystick 4..."
#define STR_SOUND "Sound card:"
#define STR_SOUND1 "Sound card 1:"
#define STR_SOUND2 "Sound card 2:"
#define STR_SOUND3 "Sound card 3:"
#define STR_SOUND4 "Sound card 4:"
#define STR_MIDI_OUT "MIDI Out Device:"
#define STR_MIDI_IN "MIDI In Device:"
#define STR_MPU401 "Standalone MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Use FLOAT32 sound"
#define STR_FM_DRIVER "FM synth driver"
#define STR_FM_DRV_NUKED "Nuked (more accurate)"

8
src/win/languages/en-US.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Joystick 3..."
#define STR_JOY4 "Joystick 4..."
#define STR_SOUND "Sound card:"
#define STR_SOUND1 "Sound card 1:"
#define STR_SOUND2 "Sound card 2:"
#define STR_SOUND3 "Sound card 3:"
#define STR_SOUND4 "Sound card 4:"
#define STR_MIDI_OUT "MIDI Out Device:"
#define STR_MIDI_IN "MIDI In Device:"
#define STR_MPU401 "Standalone MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Use FLOAT32 sound"
#define STR_FM_DRIVER "FM synth driver"
#define STR_FM_DRV_NUKED "Nuked (more accurate)"

8
src/win/languages/es-ES.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Mando 3..."
#define STR_JOY4 "Mando 4..."
#define STR_SOUND "Tarjeta de sonido:"
#define STR_SOUND1 "Tarjeta de sonido 1:"
#define STR_SOUND2 "Tarjeta de sonido 2:"
#define STR_SOUND3 "Tarjeta de sonido 3:"
#define STR_SOUND4 "Tarjeta de sonido 4:"
#define STR_MIDI_OUT "Dispositivo MIDI de salida:"
#define STR_MIDI_IN "Dispositivo MIDI de entrada:"
#define STR_MPU401 "MPU-401 independiente"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Usar sonido FLOAT32"
#define STR_FM_DRIVER "Controlador de sintet. FM"
#define STR_FM_DRV_NUKED "Nuked (más preciso)"

8
src/win/languages/fi-FI.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Peliohjain 3..."
#define STR_JOY4 "Peliohjain 4..."
#define STR_SOUND "Äänikortti:"
#define STR_SOUND1 "Äänikortti 1:"
#define STR_SOUND2 "Äänikortti 2:"
#define STR_SOUND3 "Äänikortti 3:"
#define STR_SOUND4 "Äänikortti 4:"
#define STR_MIDI_OUT "MIDI-ulostulo:"
#define STR_MIDI_IN "MIDI-sisääntulo:"
#define STR_MPU401 "Erillinen MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Käytä FLOAT32-ääntä"
#define STR_FM_DRIVER "FM-syntetisaattoriohjain"
#define STR_FM_DRV_NUKED "Nuked (tarkempi)"

8
src/win/languages/fr-FR.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Manette 3..."
#define STR_JOY4 "Manette 4..."
#define STR_SOUND "Carte son:"
#define STR_SOUND1 "Carte son 1:"
#define STR_SOUND2 "Carte son 2:"
#define STR_SOUND3 "Carte son 3:"
#define STR_SOUND4 "Carte son 4:"
#define STR_MIDI_OUT "Sortie MIDI:"
#define STR_MIDI_IN "Entrée MIDI:"
#define STR_MPU401 "MPU-401 autonome"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Utiliser le son FLOAT32"
#define STR_FM_DRIVER "Pilote de synthétiseur FM"
#define STR_FM_DRV_NUKED "Nuked (plus précis)"

8
src/win/languages/hr-HR.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Palica za igru 3..."
#define STR_JOY4 "Palica za igru 4..."
#define STR_SOUND "Zvučna kartica:"
#define STR_SOUND1 "Zvučna kartica 1:"
#define STR_SOUND2 "Zvučna kartica 2:"
#define STR_SOUND3 "Zvučna kartica 3:"
#define STR_SOUND4 "Zvučna kartica 4:"
#define STR_MIDI_OUT "Izlazni uređaj MIDI:"
#define STR_MIDI_IN "Ulazni uređaj MIDI:"
#define STR_MPU401 "Samostalni MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Koristi FLOAT32 za zvuk"
#define STR_FM_DRIVER "Drajver za FM sintisajzer"
#define STR_FM_DRV_NUKED "Nuked (precizniji)"

8
src/win/languages/hu-HU.rc
View File

@@ -291,13 +291,13 @@ END
#define STR_JOY3 "Játékvez. 3..."
#define STR_JOY4 "Játékvez. 4..."
#define STR_SOUND "Hangkártya:"
#define STR_SOUND1 "Hangkártya 1:"
#define STR_SOUND2 "Hangkártya 2:"
#define STR_SOUND3 "Hangkártya 3:"
#define STR_SOUND4 "Hangkártya 4:"
#define STR_MIDI_OUT "MIDI-kimenet:"
#define STR_MIDI_IN "MIDI-bemenet:"
#define STR_MPU401 "Különálló MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "FLOAT32 használata"
#define STR_FM_DRIVER "FM szintetizátor meghajtó"
#define STR_FM_DRV_NUKED "Nuked (pontosabb)"

8
src/win/languages/it-IT.rc
View File

@@ -287,13 +287,13 @@ END
#define STR_JOY3 "Joystick 3..."
#define STR_JOY4 "Joystick 4..."
#define STR_SOUND "Scheda audio:"
#define STR_SOUND1 "Scheda audio 1:"
#define STR_SOUND2 "Scheda audio 2:"
#define STR_SOUND3 "Scheda audio 3:"
#define STR_SOUND4 "Scheda audio 4:"
#define STR_MIDI_OUT "Uscita MIDI:"
#define STR_MIDI_IN "Entrata MIDI:"
#define STR_MPU401 "MPU-401 autonomo"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Usa suono FLOAT32"
#define STR_FM_DRIVER "Driver sint. FM"
#define STR_FM_DRV_NUKED "Nuked (più accurato)"

8
src/win/languages/ja-JP.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "ジョイスティック3..."
#define STR_JOY4 "ジョイスティック4..."
#define STR_SOUND "サウンドカード:"
#define STR_SOUND1 "サウンドカード 1:"
#define STR_SOUND2 "サウンドカード 2:"
#define STR_SOUND3 "サウンドカード 3:"
#define STR_SOUND4 "サウンドカード 4:"
#define STR_MIDI_OUT "MIDI出力デバイス:"
#define STR_MIDI_IN "MIDI入力デバイス:"
#define STR_MPU401 "独立型MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "FLOAT32サウンドを使用する"
#define STR_FM_DRIVER "FMシンセドライバー"
#define STR_FM_DRV_NUKED "Nuked (高精度化)"

8
src/win/languages/ko-KR.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "조이스틱 3..."
#define STR_JOY4 "조이스틱 4..."
#define STR_SOUND "사운드 카드:"
#define STR_SOUND1 "사운드 카드 1:"
#define STR_SOUND2 "사운드 카드 2:"
#define STR_SOUND3 "사운드 카드 3:"
#define STR_SOUND4 "사운드 카드 4:"
#define STR_MIDI_OUT "MIDI 출력 장치:"
#define STR_MIDI_IN "MIDI 입력 장치:"
#define STR_MPU401 "MPU-401 단독 사용"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "FLOAT32 사운드 사용"
#define STR_FM_DRIVER "FM 신디사이저 드라이버"
#define STR_FM_DRV_NUKED "Nuked (더 정확한)"

8
src/win/languages/pl-PL.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Joystick 3..."
#define STR_JOY4 "Joystick 4..."
#define STR_SOUND "Karta dźwiękowa:"
#define STR_SOUND1 "Karta dźwiękowa 1:"
#define STR_SOUND2 "Karta dźwiękowa 2:"
#define STR_SOUND3 "Karta dźwiękowa 3:"
#define STR_SOUND4 "Karta dźwiękowa 4:"
#define STR_MIDI_OUT "Urządzenie wyjściowe MIDI:"
#define STR_MIDI_IN "Urządzenie wejściowe MIDI:"
#define STR_MPU401 "Samodzielne urządzenie MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Użyj dźwięku FLOAT32"
#define STR_FM_DRIVER "Sterownik syntezy FM"
#define STR_FM_DRV_NUKED "Nuked (dokładniejszy)"

8
src/win/languages/pt-BR.rc
View File

@@ -289,13 +289,13 @@ END
#define STR_JOY3 "Joystick 3..."
#define STR_JOY4 "Joystick 4..."
#define STR_SOUND "Placa de som:"
#define STR_SOUND1 "Placa de som 1:"
#define STR_SOUND2 "Placa de som 2:"
#define STR_SOUND3 "Placa de som 3:"
#define STR_SOUND4 "Placa de som 4:"
#define STR_MIDI_OUT "Disp. saída MIDI:"
#define STR_MIDI_IN "Disp. entrada MIDI:"
#define STR_MPU401 "MPU-401 autônomo"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Usar som FLOAT32"
#define STR_FM_DRIVER "Controlador de sint. FM"
#define STR_FM_DRV_NUKED "Nuked (mais preciso)"

8
src/win/languages/pt-PT.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Joystick 3..."
#define STR_JOY4 "Joystick 4..."
#define STR_SOUND "Placa de som:"
#define STR_SOUND1 "Placa de som 1:"
#define STR_SOUND2 "Placa de som 2:"
#define STR_SOUND3 "Placa de som 3:"
#define STR_SOUND4 "Placa de som 4:"
#define STR_MIDI_OUT "Disp. saída MIDI:"
#define STR_MIDI_IN "Disp. entrada MIDI:"
#define STR_MPU401 "MPU-401 autónomo"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Utilizar som FLOAT32"
#define STR_FM_DRIVER "Controlador de sint. FM"
#define STR_FM_DRV_NUKED "Nuked (mais exacto)"

8
src/win/languages/ru-RU.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Джойстик 3..."
#define STR_JOY4 "Джойстик 4..."
#define STR_SOUND "Звуковая карта:"
#define STR_SOUND1 "Звуковая карта 1:"
#define STR_SOUND2 "Звуковая карта 2:"
#define STR_SOUND3 "Звуковая карта 3:"
#define STR_SOUND4 "Звуковая карта 4:"
#define STR_MIDI_OUT "MIDI Out устр-во:"
#define STR_MIDI_IN "MIDI In устр-во:"
#define STR_MPU401 "Отдельный MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "FLOAT32 звук"
#define STR_FM_DRIVER "Драйвер FM-синтезатора"
#define STR_FM_DRV_NUKED "Nuked (более точный)"

8
src/win/languages/sl-SI.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Igralna palica 3..."
#define STR_JOY4 "Igralna palica 4..."
#define STR_SOUND "Zvočna kartica:"
#define STR_SOUND1 "Zvočna kartica 1:"
#define STR_SOUND2 "Zvočna kartica 2:"
#define STR_SOUND3 "Zvočna kartica 3:"
#define STR_SOUND4 "Zvočna kartica 4:"
#define STR_MIDI_OUT "Izhodna naprava MIDI:"
#define STR_MIDI_IN "Vhodna naprava MIDI:"
#define STR_MPU401 "Samostojen MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "Uporabi FLOAT32 za zvok"
#define STR_FM_DRIVER "Gonilnik sintetizacije FM"
#define STR_FM_DRV_NUKED "Nuked (točnejši)"

8
src/win/languages/tr-TR.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Oyun kolu 3..."
#define STR_JOY4 "Oyun kolu 4..."
#define STR_SOUND "Ses kartı:"
#define STR_SOUND1 "Ses kartı 1:"
#define STR_SOUND2 "Ses kartı 2:"
#define STR_SOUND3 "Ses kartı 3:"
#define STR_SOUND4 "Ses kartı 4:"
#define STR_MIDI_OUT "MIDI Çıkış Cihazı:"
#define STR_MIDI_IN "MIDI Giriş Cihazı:"
#define STR_MPU401 "Bağımsız MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "FLOAT32 ses kullan"
#define STR_FM_DRIVER "FM sentez sürücüsü"
#define STR_FM_DRV_NUKED "Nuked (daha doğru)"

8
src/win/languages/uk-UA.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "Джойстик 3..."
#define STR_JOY4 "Джойстик 4..."
#define STR_SOUND "Звукова карта:"
#define STR_SOUND1 "Звукова карта 1:"
#define STR_SOUND2 "Звукова карта 2:"
#define STR_SOUND3 "Звукова карта 3:"
#define STR_SOUND4 "Звукова карта 4:"
#define STR_MIDI_OUT "MIDI Out при-ій:"
#define STR_MIDI_IN "MIDI In при-ій:"
#define STR_MPU401 "Окремий MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "FLOAT32 звук"
#define STR_FM_DRIVER "Драйвер FM-синтезатора"
#define STR_FM_DRV_NUKED "Nuked (більш точний)"

8
src/win/languages/zh-CN.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "操纵杆 3..."
#define STR_JOY4 "操纵杆 4..."
#define STR_SOUND "声卡:"
#define STR_SOUND1 "声卡 1:"
#define STR_SOUND2 "声卡 2:"
#define STR_SOUND3 "声卡 3:"
#define STR_SOUND4 "声卡 4:"
#define STR_MIDI_OUT "MIDI 输出设备:"
#define STR_MIDI_IN "MIDI 输入设备:"
#define STR_MPU401 "独立 MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "使用单精度浮点 (FLOAT32)"
#define STR_FM_DRIVER "调频合成器驱动器"
#define STR_FM_DRV_NUKED "Nuked (更准确)"

8
src/win/languages/zh-TW.rc
View File

@@ -286,13 +286,13 @@ END
#define STR_JOY3 "搖桿 3..."
#define STR_JOY4 "搖桿 4..."
#define STR_SOUND "音訊卡:"
#define STR_SOUND1 "音訊卡 1:"
#define STR_SOUND2 "音訊卡 2:"
#define STR_SOUND3 "音訊卡 3:"
#define STR_SOUND4 "音訊卡 4:"
#define STR_MIDI_OUT "MIDI 輸出裝置:"
#define STR_MIDI_IN "MIDI 輸入裝置:"
#define STR_MPU401 "獨立 MPU-401"
#define STR_SSI "Innovation SSI-2001"
#define STR_CMS "CMS / Game Blaster"
#define STR_GUS "Gravis Ultrasound"
#define STR_FLOAT "使用單精度浮點 (FLOAT32)"
#define STR_FM_DRIVER "調頻合成器驅動器"
#define STR_FM_DRV_NUKED "Nuked (更準確)"

253
src/win/win_settings.c
View File

@@ -99,7 +99,8 @@ static int temp_gfxcard, temp_gfxcard_2, temp_ibm8514, temp_voodoo, temp_xga;
static int temp_mouse, temp_joystick;
/* Sound category */
static int temp_sound_card, temp_midi_output_device, temp_midi_input_device, temp_mpu401, temp_SSI2001, temp_GAMEBLASTER, temp_GUS;
static int temp_sound_card[SOUND_CARD_MAX];
static int temp_midi_output_device, temp_midi_input_device, temp_mpu401;
static int temp_float, temp_fm_driver;
/* Network category */
@@ -335,13 +336,11 @@ win_settings_init(void)
temp_joystick = joystick_type;
/* Sound category */
temp_sound_card = sound_card_current;
for (i = 0; i < SOUND_CARD_MAX; i++)
temp_sound_card[i] = sound_card_current[i];
temp_midi_output_device = midi_output_device_current;
temp_midi_input_device = midi_input_device_current;
temp_mpu401 = mpu401_standalone_enable;
temp_SSI2001 = SSI2001;
temp_GAMEBLASTER = GAMEBLASTER;
temp_GUS = GUS;
temp_float = sound_is_float;
temp_fm_driver = fm_driver;
@@ -462,13 +461,11 @@ win_settings_changed(void)
i = i || (joystick_type != temp_joystick);
/* Sound category */
i = i || (sound_card_current != temp_sound_card);
for (j = 0; j < SOUND_CARD_MAX; j++)
i = i || (sound_card_current[j] != temp_sound_card[j]);
i = i || (midi_output_device_current != temp_midi_output_device);
i = i || (midi_input_device_current != temp_midi_input_device);
i = i || (mpu401_standalone_enable != temp_mpu401);
i = i || (SSI2001 != temp_SSI2001);
i = i || (GAMEBLASTER != temp_GAMEBLASTER);
i = i || (GUS != temp_GUS);
i = i || (sound_is_float != temp_float);
i = i || (fm_driver != temp_fm_driver);
@@ -555,13 +552,11 @@ win_settings_save(void)
joystick_type = temp_joystick;
/* Sound category */
sound_card_current = temp_sound_card;
for (i = 0; i < SOUND_CARD_MAX; i++)
sound_card_current[i] = temp_sound_card[i];
midi_output_device_current = temp_midi_output_device;
midi_input_device_current = temp_midi_input_device;
mpu401_standalone_enable = temp_mpu401;
SSI2001 = temp_SSI2001;
GAMEBLASTER = temp_GAMEBLASTER;
GUS = temp_GUS;
sound_is_float = temp_float;
fm_driver = temp_fm_driver;
@@ -1396,16 +1391,16 @@ static BOOL CALLBACK
#endif
win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{
int c, d;
uint16_t c, d;
LPTSTR lptsTemp;
const device_t *sound_dev;
const device_t *sound_dev[SOUND_CARD_MAX];
switch (message) {
case WM_INITDIALOG:
lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
c = d = 0;
settings_reset_content(hdlg, IDC_COMBO_SOUND);
settings_reset_content(hdlg, IDC_COMBO_SOUND1);
while (1) {
/* Skip "internal" if machine doesn't have it. */
if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_SOUND)) {
@@ -1419,18 +1414,18 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
break;
if (sound_card_available(c)) {
sound_dev = sound_card_getdevice(c);
sound_dev[0] = sound_card_getdevice(c);
if (device_is_valid(sound_dev, temp_machine)) {
if (device_is_valid(sound_dev[0], temp_machine)) {
if (c == 0)
settings_add_string(hdlg, IDC_COMBO_SOUND, win_get_string(IDS_2104));
settings_add_string(hdlg, IDC_COMBO_SOUND1, win_get_string(IDS_2104));
else if (c == 1)
settings_add_string(hdlg, IDC_COMBO_SOUND, win_get_string(IDS_2119));
settings_add_string(hdlg, IDC_COMBO_SOUND1, win_get_string(IDS_2119));
else
settings_add_string(hdlg, IDC_COMBO_SOUND, (LPARAM) device_name);
settings_add_string(hdlg, IDC_COMBO_SOUND1, (LPARAM) device_name);
settings_list_to_device[0][d] = c;
if ((c == 0) || (c == temp_sound_card))
settings_set_cur_sel(hdlg, IDC_COMBO_SOUND, d);
if ((c == 0) || (c == temp_sound_card[0]))
settings_set_cur_sel(hdlg, IDC_COMBO_SOUND1, d);
d++;
}
}
@@ -1438,8 +1433,119 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
c++;
}
settings_enable_window(hdlg, IDC_COMBO_SOUND, d);
settings_enable_window(hdlg, IDC_CONFIGURE_SND, sound_card_has_config(temp_sound_card));
settings_enable_window(hdlg, IDC_COMBO_SOUND1, d);
settings_enable_window(hdlg, IDC_CONFIGURE_SND1, sound_card_has_config(temp_sound_card[0]));
c = d = 0;
settings_reset_content(hdlg, IDC_COMBO_SOUND2);
while (1) {
/* Skip "internal" */
if (c == 1) {
c++;
continue;
}
generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
if (!device_name[0])
break;
if (sound_card_available(c)) {
sound_dev[1] = sound_card_getdevice(c);
if (device_is_valid(sound_dev[1], temp_machine)) {
if (c == 0)
settings_add_string(hdlg, IDC_COMBO_SOUND2, win_get_string(IDS_2104));
else if (c == 1)
settings_add_string(hdlg, IDC_COMBO_SOUND2, win_get_string(IDS_2119));
else
settings_add_string(hdlg, IDC_COMBO_SOUND2, (LPARAM) device_name);
settings_list_to_device[0][d] = c;
if ((c == 0) || (c == temp_sound_card[1]))
settings_set_cur_sel(hdlg, IDC_COMBO_SOUND2, d);
d++;
}
}
c++;
}
settings_enable_window(hdlg, IDC_COMBO_SOUND2, d);
settings_enable_window(hdlg, IDC_CONFIGURE_SND2, sound_card_has_config(temp_sound_card[1]));
c = d = 0;
settings_reset_content(hdlg, IDC_COMBO_SOUND3);
while (1) {
/* Skip "internal" */
if (c == 1) {
c++;
continue;
}
generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
if (!device_name[0])
break;
if (sound_card_available(c)) {
sound_dev[2] = sound_card_getdevice(c);
if (device_is_valid(sound_dev[2], temp_machine)) {
if (c == 0)
settings_add_string(hdlg, IDC_COMBO_SOUND3, win_get_string(IDS_2104));
else if (c == 1)
settings_add_string(hdlg, IDC_COMBO_SOUND3, win_get_string(IDS_2119));
else
settings_add_string(hdlg, IDC_COMBO_SOUND3, (LPARAM) device_name);
settings_list_to_device[0][d] = c;
if ((c == 0) || (c == temp_sound_card[2]))
settings_set_cur_sel(hdlg, IDC_COMBO_SOUND3, d);
d++;
}
}
c++;
}
settings_enable_window(hdlg, IDC_COMBO_SOUND3, d);
settings_enable_window(hdlg, IDC_CONFIGURE_SND3, sound_card_has_config(temp_sound_card[2]));
c = d = 0;
settings_reset_content(hdlg, IDC_COMBO_SOUND4);
while (1) {
/* Skip "internal" */
if (c == 1) {
c++;
continue;
}
generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
if (!device_name[0])
break;
if (sound_card_available(c)) {
sound_dev[3] = sound_card_getdevice(c);
if (device_is_valid(sound_dev[3], temp_machine)) {
if (c == 0)
settings_add_string(hdlg, IDC_COMBO_SOUND4, win_get_string(IDS_2104));
else if (c == 1)
settings_add_string(hdlg, IDC_COMBO_SOUND4, win_get_string(IDS_2119));
else
settings_add_string(hdlg, IDC_COMBO_SOUND4, (LPARAM) device_name);
settings_list_to_device[0][d] = c;
if ((c == 0) || (c == temp_sound_card[3]))
settings_set_cur_sel(hdlg, IDC_COMBO_SOUND4, d);
d++;
}
}
c++;
}
settings_enable_window(hdlg, IDC_COMBO_SOUND4, d);
settings_enable_window(hdlg, IDC_CONFIGURE_SND4, sound_card_has_config(temp_sound_card[3]));
c = d = 0;
settings_reset_content(hdlg, IDC_COMBO_MIDI_OUT);
@@ -1491,15 +1597,6 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_CMS, machine_has_bus(temp_machine, MACHINE_BUS_ISA));
settings_set_check(hdlg, IDC_CHECK_CMS, temp_GAMEBLASTER);
settings_enable_window(hdlg, IDC_CONFIGURE_CMS, machine_has_bus(temp_machine, MACHINE_BUS_ISA) && temp_GAMEBLASTER);
settings_enable_window(hdlg, IDC_CHECK_GUS, machine_has_bus(temp_machine, MACHINE_BUS_ISA16));
settings_set_check(hdlg, IDC_CHECK_GUS, temp_GUS);
settings_enable_window(hdlg, IDC_CONFIGURE_GUS, machine_has_bus(temp_machine, MACHINE_BUS_ISA16) && temp_GUS);
settings_enable_window(hdlg, IDC_CHECK_SSI, machine_has_bus(temp_machine, MACHINE_BUS_ISA));
settings_set_check(hdlg, IDC_CHECK_SSI, temp_SSI2001);
settings_enable_window(hdlg, IDC_CONFIGURE_SSI, machine_has_bus(temp_machine, MACHINE_BUS_ISA) && temp_SSI2001);
settings_set_check(hdlg, IDC_CHECK_FLOAT, temp_float);
if (temp_fm_driver == FM_DRV_YMFM)
@@ -1513,17 +1610,56 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_COMBO_SOUND:
temp_sound_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND)];
settings_enable_window(hdlg, IDC_CONFIGURE_SND, sound_card_has_config(temp_sound_card));
case IDC_COMBO_SOUND1:
temp_sound_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
settings_enable_window(hdlg, IDC_CONFIGURE_SND1, sound_card_has_config(temp_sound_card[0]));
settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
break;
case IDC_CONFIGURE_SND:
temp_sound_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card));
case IDC_CONFIGURE_SND1:
temp_sound_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[0]));
break;
case IDC_COMBO_SOUND2:
temp_sound_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
settings_enable_window(hdlg, IDC_CONFIGURE_SND2, sound_card_has_config(temp_sound_card[1]));
settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
break;
case IDC_CONFIGURE_SND2:
temp_sound_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[1]));
break;
case IDC_COMBO_SOUND3:
temp_sound_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
settings_enable_window(hdlg, IDC_CONFIGURE_SND3, sound_card_has_config(temp_sound_card[2]));
settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
break;
case IDC_CONFIGURE_SND3:
temp_sound_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[2]));
break;
case IDC_COMBO_SOUND4:
temp_sound_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
settings_enable_window(hdlg, IDC_CONFIGURE_SND4, sound_card_has_config(temp_sound_card[3]));
settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
break;
case IDC_CONFIGURE_SND4:
temp_sound_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[3]));
break;
case IDC_COMBO_MIDI_OUT:
@@ -1561,46 +1697,17 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
case IDC_CONFIGURE_MPU401:
temp_deviceconfig |= deviceconfig_open(hdlg, machine_has_bus(temp_machine, MACHINE_BUS_MCA) ? (void *) &mpu401_mca_device : (void *) &mpu401_device);
break;
case IDC_CHECK_CMS:
temp_GAMEBLASTER = settings_get_check(hdlg, IDC_CHECK_CMS);
settings_enable_window(hdlg, IDC_CONFIGURE_CMS, temp_GAMEBLASTER);
break;
case IDC_CONFIGURE_CMS:
temp_deviceconfig |= deviceconfig_open(hdlg, &cms_device);
break;
case IDC_CHECK_GUS:
temp_GUS = settings_get_check(hdlg, IDC_CHECK_GUS);
settings_enable_window(hdlg, IDC_CONFIGURE_GUS, temp_GUS);
break;
case IDC_CONFIGURE_GUS:
temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &gus_device);
break;
case IDC_CHECK_SSI:
temp_SSI2001 = settings_get_check(hdlg, IDC_CHECK_SSI);
settings_enable_window(hdlg, IDC_CONFIGURE_SSI, temp_SSI2001);
break;
case IDC_CONFIGURE_SSI:
temp_deviceconfig |= deviceconfig_open(hdlg, &ssi2001_device);
break;
}
return FALSE;
case WM_SAVESETTINGS:
temp_sound_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND)];
temp_sound_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
temp_sound_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
temp_sound_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
temp_sound_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
temp_midi_output_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_OUT)];
temp_midi_input_device = settings_list_to_midi_in[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_IN)];
temp_mpu401 = settings_get_check(hdlg, IDC_CHECK_MPU401);
temp_GAMEBLASTER = settings_get_check(hdlg, IDC_CHECK_CMS);
temp_GUS = settings_get_check(hdlg, IDC_CHECK_GUS);
temp_SSI2001 = settings_get_check(hdlg, IDC_CHECK_SSI);
temp_float = settings_get_check(hdlg, IDC_CHECK_FLOAT);
if (settings_get_check(hdlg, IDC_RADIO_FM_DRV_NUKED))
temp_fm_driver = FM_DRV_NUKED;