From b56b721650eaa3caccbbec11e48802705c7a0cf7 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 2 Jan 2022 20:02:33 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D0=BE=D1=87=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9=20//?= =?UTF-8?q?=20A=20couple=20of=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/win/languages/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 36ebf4ee3..413b0c5f3 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -481,8 +481,8 @@ BEGIN IDS_2121 "Хотите ли вы сохранить настройки?" IDS_2122 "Это приведет к холодной перезагрузке эмулируемой машины." IDS_2123 "Сохранить" - IDS_2124 "О программе 86Box" - IDS_2125 "86Box v" EMU_VERSION + IDS_2124 "О 86Box" + IDS_2125 "86Box v." EMU_VERSION IDS_2126 "Эмулятор старых компьютеров\n\nАвторы: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, Tiseno100, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nВыпускается под лицензией GNU General Public License версии 2 или более поздней. Дополнительную информацию см. в файле LICENSE." IDS_2127 "OK" From f3758c065828787f7bf0393583cf7e32714bded2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laci=20b=C3=A1?= Date: Sun, 2 Jan 2022 23:27:06 +0100 Subject: [PATCH 2/4] Update hu-HU.rc --- src/win/languages/hu-HU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 3a8dfe756..731ef0e42 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -532,8 +532,8 @@ BEGIN IDS_2149 "Magnókazetta-képek (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Minden fájl (*.*)\0*.*\0" IDS_2150 "ROM-kazetta %i: %ls" IDS_2151 "ROM-kazetta képek (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Minden fájl (*.*)\0*.*\0" - IDS_2152 "Error initializing renderer" - IDS_2153 "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer." + IDS_2152 "Hiba történt a renderelő inicializálásakor" + IDS_2153 "Az OpenGL (3.0 Core) megjelenítő-motort nem sikerült inicializálni. Kérem használjon másik renderelőt." END STRINGTABLE DISCARDABLE From 499a74121e7ffc0b186ebf18a53d2d64130314f6 Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 5 Jan 2022 19:28:39 +0100 Subject: [PATCH 3/4] Fixed the configuration file section the MIDI input device is obtained from. --- src/sound/midi_rtmidi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/midi_rtmidi.cpp b/src/sound/midi_rtmidi.cpp index e150159e4..3354568f6 100644 --- a/src/sound/midi_rtmidi.cpp +++ b/src/sound/midi_rtmidi.cpp @@ -166,7 +166,7 @@ rtmidi_input_init(const device_t *info) return nullptr; } - midi_in_id = config_get_int((char*)SYSTEM_MIDI_NAME, (char*)"midi_input", 0); + midi_in_id = config_get_int((char*)MIDI_INPUT_NAME, (char*)"midi_input", 0); try { midiin->openPort(midi_in_id); From d8f45bcaef370508a3d7ee6af2e6d4e03ce91d1e Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 5 Jan 2022 23:58:07 +0100 Subject: [PATCH 4/4] Explicitly tell RTMIDI to not ignore any midi in message types. --- src/sound/midi_rtmidi.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sound/midi_rtmidi.cpp b/src/sound/midi_rtmidi.cpp index 3354568f6..50246cac8 100644 --- a/src/sound/midi_rtmidi.cpp +++ b/src/sound/midi_rtmidi.cpp @@ -183,7 +183,10 @@ rtmidi_input_init(const device_t *info) } } - midiin->setCallback(rtmidi_input_callback); + midiin->setCallback(&rtmidi_input_callback); + + // Don't ignore sysex, timing, or active sensing messages. + midiin->ignoreTypes(false, false, false); midi_in_init(dev, &midi_in);