diff --git a/src/devices/sound/snd_mpu401.c b/src/devices/sound/snd_mpu401.c index 98dec7c..340fe9a 100644 --- a/src/devices/sound/snd_mpu401.c +++ b/src/devices/sound/snd_mpu401.c @@ -8,7 +8,7 @@ * * Roland MPU-401 emulation. * - * Version: @(#)snd_mpu401.c 1.0.9 2018/09/03 + * Version: @(#)snd_mpu401.c 1.0.10 2018/09/04 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -326,28 +326,29 @@ MPU401_WriteCommand(mpu_t *mpu, uint8_t val) return; case 0xb1: /* Reset relative tempo */ - mpu->clock.tempo_rel=40; + mpu->clock.old_tempo_rel = mpu->clock.tempo_rel; + mpu->clock.tempo_rel = 40; break; case 0xb9: /* Clear play map */ case 0xb8: /* Clear play counters */ - for (i=0xb0;i<0xbf;i++) { + for (i = 0xb0; i < 0xbf; i++) { /* All notes off */ midi_write(i); midi_write(0x7b); midi_write(0); } - for (i=0;i<8;i++) { - mpu->playbuf[i].counter=0; - mpu->playbuf[i].type=T_OVERFLOW; + for (i = 0; i < 8; i++) { + mpu->playbuf[i].counter = 0; + mpu->playbuf[i].type = T_OVERFLOW; } - mpu->condbuf.counter=0; - mpu->condbuf.type=T_OVERFLOW; - if (!(mpu->state.conductor=mpu->state.cond_set)) - mpu->state.cond_req=0; - mpu->state.amask=mpu->state.tmask; - mpu->state.req_mask=0; - mpu->state.irq_pending=1; + mpu->condbuf.counter = 0; + mpu->condbuf.type = T_OVERFLOW; + if (! (mpu->state.conductor = mpu->state.cond_set)) + mpu->state.cond_req = 0; + mpu->state.amask = mpu->state.tmask; + mpu->state.req_mask = 0; + mpu->state.irq_pending = 1; break; case 0xff: /* Reset MPU-401 */ @@ -389,8 +390,8 @@ MPU401_WriteData(mpu_t *mpu, uint8_t val) case 0xe1: /* Set relative tempo */ mpu->state.command_byte=0; - if (val!=0x40) //default value - pclog("MPU-401:Relative tempo change not implemented\n"); + mpu->clock.old_tempo_rel=mpu->clock.tempo_rel; + mpu->clock.tempo_rel=val; return; case 0xe7: /* Set internal clock to host interval */ @@ -799,7 +800,7 @@ mpu401_read(uint16_t addr, void *priv) case 1: //Read Status if (mpu->state.cmd_pending) ret=STATUS_OUTPUT_NOT_READY; if (!mpu->queue_used) ret=STATUS_INPUT_NOT_READY; - ret |= 0x3f; //FIXME: check with MPU401 TechRef + ret |= 0x3f; pclog("Read Status (0x331) %x\n", ret); break; @@ -853,7 +854,7 @@ MPU401_Event(void *priv) next_event: /* mpu401_event_callback = 0LL; */ - new_time = (mpu->clock.tempo * mpu->clock.timebase); + new_time = ((mpu->clock.tempo * mpu->clock.timebase * mpu->clock.tempo_rel)/0x40); if (new_time == 0) { mpu401_event_callback = 0LL; return; @@ -867,13 +868,6 @@ next_event: void mpu401_init(mpu_t *mpu, uint16_t addr, int irq, int mode) { -#if 0 - if (mode != M_INTELLIGENT) { - mpu401_uart_init(mpu, addr); - return; - } -#endif - mpu->status = STATUS_INPUT_NOT_READY; mpu->irq = irq; mpu->queue_used = 0; diff --git a/src/ui/lang/VARCem-DE.str b/src/ui/lang/VARCem-DE.str index 43b1768..e4e4a79 100644 --- a/src/ui/lang/VARCem-DE.str +++ b/src/ui/lang/VARCem-DE.str @@ -8,7 +8,7 @@ * * String definitions for "German (Germany)" language. * - * Version: @(#)VARCem-DE.str 1.0.9 2018/09/03 + * Version: @(#)VARCem-DE.str 1.0.10 2018/09/04 * * Authors: Michael Drüing, * Fred N. van Kempen, @@ -48,7 +48,7 @@ */ /* Do not translate! */ -#define TAG_VERSION 1,0,9 +#define TAG_VERSION 1,0,10 #define TAG_AUTHOR "Michael Drüing" #define TAG_EMAIL "michael@drueing.de" @@ -78,7 +78,7 @@ #define STR_2305 "Gewählter Anzeigetreiber '%S' nicht verfügbar. Auf Standard zurücksetzen?" #define STR_2306 "Es gab nie ST506 oder ESDI CD-ROM Laufwerke" #define STR_2307 "USB wird noch nicht unterstützt" -#define STR_2308 "You must save your new settings first!" +#define STR_2308 "Die neuen Einstellungen müssen erst gespeichert werden!" /* Application messages (2400.) */ diff --git a/src/ui/lang/VARCem-ES.str b/src/ui/lang/VARCem-ES.str index f331df8..11eb497 100644 --- a/src/ui/lang/VARCem-ES.str +++ b/src/ui/lang/VARCem-ES.str @@ -8,7 +8,7 @@ * * String definitions for "Spanish (Spain, Normal Sort)" language. * - * Version: @(#)VARCem-ES.str 1.0.8 2018/09/03 + * Version: @(#)VARCem-ES.str 1.0.9 2018/09/04 * * Authors: Natalia Portillo, * Fred N. van Kempen, @@ -48,7 +48,7 @@ */ /* Do not translate! */ -#define TAG_VERSION 1,0,8 +#define TAG_VERSION 1,0,9 #define TAG_AUTHOR "Natalia Portillo" #define TAG_EMAIL "claunia@claunia.com" @@ -79,7 +79,7 @@ #define STR_2305 "El renderizador '%S' seleccionado no está disponible. ¿Establecer renderizador por defecto?" #define STR_2306 "Las unidades de CD-ROM ST506 o ESDI CD-ROM nunca existieron" #define STR_2307 "El USB no está soportado aún" -#define STR_2308 "You must save your new settings first!" +#define STR_2308 "¡Debe guardar la nueva configuración primero!" /* Mensajes de aplicación (2400.) */ diff --git a/src/ui/lang/VARCem-FR.str b/src/ui/lang/VARCem-FR.str index 6692c33..f489c56 100644 --- a/src/ui/lang/VARCem-FR.str +++ b/src/ui/lang/VARCem-FR.str @@ -8,7 +8,7 @@ * * String definitions for "French (France)" language. * - * Version: @(#)VARCem-FR.str 1.0.9 2018/09/03 + * Version: @(#)VARCem-FR.str 1.0.10 2018/09/04 * * Authors: Altheos, * Fred N. van Kempen, @@ -48,7 +48,7 @@ */ /* Do not translate! */ -#define TAG_VERSION 1,0,9 +#define TAG_VERSION 1,0,10 #define TAG_AUTHOR "Altheos" #define TAG_EMAIL "altheos@varcem.com" @@ -79,7 +79,7 @@ #define STR_2305 "La méthode de rendu sélectionnée '%S' n'est pas disponible. Revenir au paramétrage par défaut ?" #define STR_2306 "Les CD-ROM ST506 ou ESDI n'ont jamais existé" #define STR_2307 "Le bus USB n'est pas implémenté" -#define STR_2308 "You must save your new settings first!" +#define STR_2308 "Vous devez enregistrer vos nouveaux paramètres avant!" /* Application messages (2400.) */ diff --git a/src/ui/lang/VARCem-KR.str b/src/ui/lang/VARCem-KR.str index d99715d..beae9b1 100644 --- a/src/ui/lang/VARCem-KR.str +++ b/src/ui/lang/VARCem-KR.str @@ -8,7 +8,7 @@ * * String definitions for "Korean (South Korea)" language. * - * Version: @(#)VARCem-KR.str 1.0.10 2018/09/03 + * Version: @(#)VARCem-KR.str 1.0.11 2018/09/04 * * Authors: Yeong Uk Jo, * Fred N. van Kempen, @@ -48,7 +48,7 @@ */ /* Do not translate! */ -#define TAG_VERSION 1,0,10 +#define TAG_VERSION 1,0,11 #define TAG_AUTHOR "Yeong Uk Jo" #define TAG_EMAIL "greatpsycho@yahoo.com" @@ -78,7 +78,7 @@ #define STR_2305 "설정된 렌더러 '%S' 는 사용할 수 없습니다. 기본값으로 초기화하시겠습니까?" #define STR_2306 "ST506 혹은 ESDI 방식의 CD-ROM 드라이브는 없습니다" #define STR_2307 "USB는 아직 지원하지 않습니다." -#define STR_2308 "You must save your new settings first!" +#define STR_2308 "새 설정을 저장해야 합니다" /* Application messages (2400.) */ @@ -125,9 +125,9 @@ /* UI: dialog: About (3200.) */ #define STR_ABOUT "VARCem에 대해.." #define STR_3201 "저자:" -#define STR_3202 "Fred N. van Kempen, Miran Grca, Sarah Walker and others.\nBased on earlier works like 86Box, PCem, MAME, DOSbox and Qemu." -#define STR_3203 "Released under the BSD 3-Clause License, and the GNU General Public License (version 2 or up) for existing, imported code from other projects." -#define STR_3204 "See LICENSE.txt for more information." +#define STR_3202 "Fred N. van Kempen, Miran Grca, Sarah Walker 와 기타 지원자들에 의해\n초기 버전의 86Box, PCem, MAME, DOSbox 와 Qemu를 기반으로 개발되었습니다." +#define STR_3203 "BSD 3-Clause 라이선스에 따라 출시되었고, 다른 프로젝트에서 이식된 부분은 GNU General Public 라이선스 (버전 2 이상)을 따릅니다." +#define STR_3204 "추가적인 정보는 LICENSE.txt 를 확인하세요." /* UI: dialog: Localization (3210.) */ #define STR_LOCALIZE "다국어" diff --git a/src/ui/lang/VARCem-RU.str b/src/ui/lang/VARCem-RU.str index c15c2b4..c9e95a1 100644 --- a/src/ui/lang/VARCem-RU.str +++ b/src/ui/lang/VARCem-RU.str @@ -8,7 +8,7 @@ * * String definitions for "Russian (Russia)" language. * - * Version: @(#)VARCem-RU.str 1.0.13 2018/09/03 + * Version: @(#)VARCem-RU.str 1.0.14 2018/09/04 * * Authors: Tarlabnor, * Fred N. van Kempen, @@ -47,7 +47,7 @@ */ /* Do not translate! */ -#define TAG_VERSION 1,0,13 +#define TAG_VERSION 1,0,14 #define TAG_AUTHOR "Tarlabnor" #define TAG_EMAIL "tarlabnor@varcem.com" @@ -77,7 +77,7 @@ #define STR_2305 "Выбранный рендерер '%S' недоступен. Использовать основной?" #define STR_2306 "ST506 и ESDI дисководы CD-ROM никогда не существовали" #define STR_2307 "USB пока не поддерживается" -#define STR_2308 "You must save your new settings first!" +#define STR_2308 "Сначала вы должны сохранить новые настройки!" /* Application messages (2400.) */