aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fm_banks/adldata-cache.datbin538864 -> 538864 bytes
-rw-r--r--fm_banks/wopl_files/DMXOPL3-by-sneakernets.woplbin16983 -> 16983 bytes
-rw-r--r--src/adldata.cpp40
-rw-r--r--src/adlmidi.cpp6
-rw-r--r--utils/adlmidi-2/9x15.hpp6
-rw-r--r--utils/adlmidi-2/input.cc4
-rw-r--r--utils/adlmidi-2/input.hpp2
-rw-r--r--utils/adlmidi-2/puzzlegame.cc2
8 files changed, 30 insertions, 30 deletions
diff --git a/fm_banks/adldata-cache.dat b/fm_banks/adldata-cache.dat
index 27bdea5..b955371 100644
--- a/fm_banks/adldata-cache.dat
+++ b/fm_banks/adldata-cache.dat
Binary files differ
diff --git a/fm_banks/wopl_files/DMXOPL3-by-sneakernets.wopl b/fm_banks/wopl_files/DMXOPL3-by-sneakernets.wopl
index 9e91724..a9ec1af 100644
--- a/fm_banks/wopl_files/DMXOPL3-by-sneakernets.wopl
+++ b/fm_banks/wopl_files/DMXOPL3-by-sneakernets.wopl
Binary files differ
diff --git a/src/adldata.cpp b/src/adldata.cpp
index 429374c..8a5a8f3 100644
--- a/src/adldata.cpp
+++ b/src/adldata.cpp
@@ -4228,8 +4228,8 @@ const adldata adl[4384] =
{ 0x118537A,0x5177432, 0x21,0x00, 0x4, -12 },
{ 0x0364121,0x02B7221, 0x21,0x08, 0xC, +0 },
{ 0x026F021,0x0056121, 0x26,0x03, 0xC, +0 },
- { 0x0577321,0x117C021, 0x19,0x03, 0xC, +0 },
- { 0x2E76530,0x307F520, 0x10,0x08, 0x8, +0 },
+ { 0x0578321,0x117C021, 0x19,0x03, 0xC, +0 },
+ { 0x2E77530,0x307F520, 0x10,0x08, 0x8, +0 },
{ 0x036F121,0x337F121, 0x92,0x08, 0xE, +0 },
{ 0x0368121,0x037F121, 0x92,0x08, 0xE, +0 },
{ 0x0A66121,0x0976121, 0x9B,0x08, 0xE, +0 },
@@ -4239,7 +4239,7 @@ const adldata adl[4384] =
{ 0x10B8020,0x11B6330, 0x87,0x00, 0x8, +12 },
{ 0x0235031,0x0076C64, 0x58,0x08, 0xA, +0 },
{ 0x055D531,0x0076C72, 0x17,0x0D, 0x6, +0 },
- { 0x2077820,0x2074331, 0x97,0x00, 0x6, +0 },
+ { 0x2077830,0x2076331, 0x94,0x00, 0xA, +0 },
{ 0x0199031,0x01B6134, 0x95,0x80, 0xA, +0 },
{ 0x0177532,0x0174531, 0x93,0x03, 0xC, +0 },
{ 0x0277530,0x0174536, 0x14,0x9C, 0xE, +12 },
@@ -4249,7 +4249,7 @@ const adldata adl[4384] =
{ 0x1274472,0x01745B1, 0x8D,0x05, 0x4, +0 },
{ 0x2F0F051,0x09A7801, 0x03,0x12, 0xA, +0 },
{ 0x00457F2,0x0375761, 0xA8,0x00, 0xE, +0 },
- { 0x0545C7E,0x0776861, 0x00,0x0D, 0xE, +0 },
+ { 0x2545C73,0x0776821, 0x00,0x0D, 0xE, +0 },
{ 0x5543737,0x25D67A1, 0x28,0x00, 0x8, +0 },
{ 0x6243371,0x46D6331, 0x20,0x00, 0x6, +0 },
{ 0x00F31D1,0x0053271, 0xC7,0x00, 0xB, +0 },
@@ -4262,7 +4262,7 @@ const adldata adl[4384] =
{ 0x43357F2,0x00767E1, 0x28,0x00, 0x0, +0 },
{ 0x2444830,0x43D67A1, 0x22,0x00, 0x8, +0 },
{ 0x534B821,0x13D87A1, 0x1F,0x00, 0xA, +0 },
- { 0x32B7320,0x12BF131, 0x40,0x00, 0x8, +0 },
+ { 0x32B7420,0x12BF134, 0x46,0x00, 0x8, +0 },
{ 0x5029072,0x0069061, 0x96,0x09, 0x8, +0 },
{ 0x1019031,0x0069061, 0x1A,0x09, 0x6, +0 },
{ 0x245C224,0x2550133, 0x83,0x80, 0x9, -36 },
@@ -4271,31 +4271,31 @@ const adldata adl[4384] =
{ 0x132ED30,0x3E7D010, 0x87,0x0D, 0x6, +12 },
{ 0x2946374,0x005A0A1, 0xA5,0x05, 0x2, +0 },
{ 0x2055F02,0x004FFE1, 0xA8,0x05, 0x0, +0 },
- { 0x00521A2,0x0053361, 0xC0,0x00, 0x9, +0 },
- { 0x0052162,0x00533E1, 0xC0,0x00, 0x7, +0 },
+ { 0x0031131,0x0054361, 0xD4,0x00, 0x4, +0 },
+ { 0x20311B0,0x00543E1, 0xD9,0x00, 0x4, +0 },
{ 0x245A121,0x126A121, 0x98,0x05, 0xC, +0 },
{ 0x255A421,0x126A121, 0x98,0x05, 0xC, +0 },
- { 0x005F0E1,0x0548161, 0x44,0x00, 0xB, +0 },
- { 0x105F0E1,0x0547161, 0x44,0x80, 0xB, +0 },
+ { 0x20470E0,0x1148161, 0x59,0x03, 0x2, +0 },
+ { 0x10460E1,0x2148161, 0x5F,0x83, 0x6, +0 },
{ 0x0336186,0x05452E1, 0xA7,0x00, 0x6, +0 },
{ 0x13351A6,0x05452E1, 0xA7,0x00, 0x0, +0 },
{ 0x2529084,0x1534341, 0x9D,0x80, 0xC, +0 },
{ 0x2529082,0x0534341, 0x9D,0x80, 0xC, +0 },
{ 0x2345231,0x2135120, 0x98,0x00, 0x6, +0 },
{ 0x410F422,0x1233231, 0x20,0x00, 0xA, +0 },
- { 0x1521162,0x1632061, 0x90,0x80, 0x8, +0 },
- { 0x1521161,0x1632061, 0x90,0x80, 0x8, +0 },
+ { 0x1522162,0x1633021, 0x99,0x80, 0x8, +0 },
+ { 0x1522161,0x1633021, 0x99,0x80, 0x8, +0 },
{ 0x157B261,0x019F806, 0x04,0x40, 0x7, +0 },
{ 0x157B261,0x0145114, 0x04,0x40, 0x7, +0 },
{ 0x2322122,0x0133221, 0x8C,0x92, 0x6, +0 },
- { 0x0032121,0x0133122, 0x93,0x48, 0x2, +7 },
+ { 0x4033121,0x0132122, 0x93,0x48, 0x4, +7 },
{ 0x074F624,0x0249303, 0xC0,0x0D, 0x0, +0 },
{ 0x3D2C092,0x1D2D131, 0x8E,0x03, 0x0, +0 },
{ 0x0D2D091,0x1D23132, 0x8E,0x03, 0x0, +0 },
{ 0x5F29054,0x0F2C241, 0x99,0x06, 0xE, +0 },
{ 0x1F19011,0x0F2C241, 0x1A,0x06, 0x6, +0 },
- { 0x05213E1,0x2131371, 0x1A,0x88, 0x7, +0 },
- { 0x0521363,0x2131331, 0x1A,0x8D, 0x7, +0 },
+ { 0x05233E1,0x0131371, 0x1A,0x88, 0x7, +0 },
+ { 0x5522363,0x0131331, 0x1A,0x8D, 0x7, +0 },
{ 0x0B67061,0x0928032, 0x9C,0x11, 0xA, +0 },
{ 0x0057F21,0x0038F62, 0x9C,0x11, 0xA, +0 },
{ 0x0025511,0x1748201, 0x94,0x06, 0xE, +0 },
@@ -8826,24 +8826,24 @@ const struct adlinsdata adlins[4528] =
{4240,4241, 0, 1, 40000, 13,0.109375 },
{4242,4243, 0, 1, 40000, 53,0.109375 },
{4244,4245, 0, 1, 120, 0,-0.031250 },
- {4246,4246, 0, 0, 933, 933,0.000000 },
+ {4246,4246, 0, 0, 40000, 6,0.000000 },
{4247,4248, 0, 1, 40000, 133,0.156250 },
{4249,4250, 0, 1, 3886, 3886,0.078125 },
{4251,4252, 0, 1, 40000, 26,0.031250 },
{4253,4254, 0, 1, 40000, 320,0.078125 },
- {4255,4256, 0, 1, 40000, 200,0.156250 },
+ {4255,4256, 0, 1, 846, 66,0.109375 },
{4257,4258, 0, 1, 1293, 80,0.078125 },
- {4259,4260, 0, 1, 6773, 66,0.171875 },
+ {4259,4260, 0, 1, 40000, 193,0.156250 },
{4261,4262, 0, 1, 2040, 2040,0.109375 },
{4263,4264, 0, 1, 1360, 1360,0.062500 },
{4265,4266, 0, 1, 40000, 433,0.093750 },
- {4267,4268, 0, 1, 40000, 533,0.093750 },
+ {4267,4268, 0, 1, 40000, 533,0.109375 },
{4269,4270, 0, 1, 826, 826,0.093750 },
- {4271,4272, 0, 1, 40000, 840,0.062500 },
+ {4271,4272, 0, 1, 40000, 926,0.125000 },
{4273,4273, 0, 1, 886, 886,0.109375 },
{4274,4275, 0, 1, 2186, 2186,-0.046875 },
{4276,4277, 0, 1, 1486, 1486,0.125000 },
- {4278,4279, 0, 1, 40000, 486,-0.078125 },
+ {4278,4279, 0, 1, 40000, 393,-0.078125 },
{4280,4281, 0, 1, 40000, 1166,0.140625 },
{4282,4283, 0, 1, 360, 360,0.078125 },
{4284,4285, 0, 1, 1693, 1693,0.031250 },
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp
index 3b124eb..2e75bbe 100644
--- a/src/adlmidi.cpp
+++ b/src/adlmidi.cpp
@@ -572,10 +572,10 @@ ADLMIDI_EXPORT int adl_play(ADL_MIDIPlayer *device, int sampleCount, short *out)
left -= (int)ate;
gotten_len += ate;
- if(ate < setup.backup_samples_size)
+ if((ate < setup.backup_samples_size) && (ate != 0))
{
- for(ssize_t j = 0; j < ate; j++)
- setup.backup_samples[(ate - 1) - j] = setup.backup_samples[(setup.backup_samples_size - 1) - j];
+ for(ssize_t i = 0, j = ate; j < setup.backup_samples_size; i++, j++)
+ setup.backup_samples[i] = setup.backup_samples[j];
}
setup.backup_samples_size -= ate;
diff --git a/utils/adlmidi-2/9x15.hpp b/utils/adlmidi-2/9x15.hpp
index 0461a6f..9812951 100644
--- a/utils/adlmidi-2/9x15.hpp
+++ b/utils/adlmidi-2/9x15.hpp
@@ -131,17 +131,17 @@ static const unsigned char bitmap[3840] = {
};
static const struct unicode_to_bitmap_index_generator
{
- static uint_least8_t Help(uint_least8_t index, bool InRecursion)
+ static uint_least8_t Help(uint8_t index, bool InRecursion)
{
return InRecursion ? (index & 0xFF) : Find(UnicodeToASCIIapproximation(index)&0xFF,
true);
}
- static uint_least8_t Find(uint_least8_t index, bool InRecursion)
+ static uint_least8_t Find(uint8_t index, bool InRecursion)
{
return
(index < 160)
? ((index < 127) ? index - 0 : Help(index,InRecursion))
- : ((index < 256) ? index - 33 : Help(index,InRecursion))
+ : /*((index < 256) ?*/ index - 33 /*: Help(index,InRecursion))*/
;
}
uint_least8_t operator[] (uint_least8_t index) const { return Find(index, false); }
diff --git a/utils/adlmidi-2/input.cc b/utils/adlmidi-2/input.cc
index 9d69469..bb276cb 100644
--- a/utils/adlmidi-2/input.cc
+++ b/utils/adlmidi-2/input.cc
@@ -5,7 +5,7 @@ xInput::xInput()
#ifdef _WIN32
inhandle = GetStdHandle(STD_INPUT_HANDLE);
#endif
-#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__)
+#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) && !defined(__APPLE__)
ioctl(0, TCGETA, &back);
struct termio term = back;
term.c_lflag &= ~(ICANON | ECHO);
@@ -17,7 +17,7 @@ xInput::xInput()
xInput::~xInput()
{
-#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__)
+#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) && !defined(__APPLE__)
if(ioctl(0, TCSETA, &back) < 0)
fcntl(0, F_SETFL, fcntl(0, F_GETFL) & ~ O_NONBLOCK);
#endif
diff --git a/utils/adlmidi-2/input.hpp b/utils/adlmidi-2/input.hpp
index 59f7f8c..0cafd51 100644
--- a/utils/adlmidi-2/input.hpp
+++ b/utils/adlmidi-2/input.hpp
@@ -34,7 +34,7 @@ class xInput
#ifdef _WIN32
void *inhandle;
#endif
- #if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__)
+ #if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) && !defined(__APPLE__)
struct termio back;
#endif
public:
diff --git a/utils/adlmidi-2/puzzlegame.cc b/utils/adlmidi-2/puzzlegame.cc
index 64c032a..07ceb94 100644
--- a/utils/adlmidi-2/puzzlegame.cc
+++ b/utils/adlmidi-2/puzzlegame.cc
@@ -92,7 +92,7 @@ bool ADLMIDI_PuzzleGame::TetrisArea::CascadeEmpty(int FirstY)
"QUINTUPLE "
" SEXTUPLE "
" SEPTUPLE "
- " OCTUPLE " + (n_full - 1) * 10;
+ " OCTUPLE " + ((n_full - 1) * 10);
for(int y = FirstY; y < Height - 1; ++y)
if(list_full & (1u << y))
DrawBlock(animx, y, label[(animx % 10)] + 0x100);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 08:26:42 +0000