Backport Spacechild1's further improvements to the PortMidi backend.

agraef · agraef · commit 685b4395f16a · 2025-06-04T23:07:35.000+02:00
See: pure-data/pure-data@9b9b2eb5 pure-data/pure-data@a68dbb97 pure-data/pure-data@bf323c88 pure-data/pure-data@7de61e64
diff --git a/pd/src/s_midi_pm.c b/pd/src/s_midi_pm.c
@@ -64,7 +64,7 @@ void sys_do_open_midi(int nmidiin, int *midiinvec,
                 if (devno == midiinvec[i])
                 {
                     err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev],
-                        j, NULL, 100, NULL, NULL);
+                        j, NULL, 1024, NULL, NULL);
                     if (err)
                         post("could not open midi input %d (%s): %s",
                             j, info->name, Pm_GetErrorText(err));
@@ -279,11 +279,10 @@ void sys_poll_midi(void)
     PmEvent buffer;
     for (i = 0; i < mac_nmidiindev; i++)
     {
-        if(Pm_Poll(mac_midiindevlist[i]))
+        while((nmess = Pm_Read(mac_midiindevlist[i], &buffer, 1)))
         {
             if (!throttle--)
                 goto overload;
-            nmess = Pm_Read(mac_midiindevlist[i], &buffer, 1);
             if (nmess > 0)
             {
                 int status = Pm_MessageStatus(buffer.message);
@@ -332,8 +331,12 @@ void sys_poll_midi(void)
                         break;
                 }
             }
-            else if (nmess != pmBufferOverflow)
-                break;
+            else
+            {
+                error("%s", Pm_GetErrorText(nmess));
+                if (nmess != pmBufferOverflow)
+                    break;
+            }
         }
     }
     overload: ;

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ void sys_do_open_midi(int nmidiin, int *midiinvec,`
`64`	`64`	`if (devno == midiinvec[i])`
`65`	`65`	`{`
`66`	`66`	`err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev],`
`67`		`- j, NULL, 100, NULL, NULL);`
	`67`	`+ j, NULL, 1024, NULL, NULL);`
`68`	`68`	`if (err)`
`69`	`69`	`post("could not open midi input %d (%s): %s",`
`70`	`70`	`j, info->name, Pm_GetErrorText(err));`
`@@ -279,11 +279,10 @@ void sys_poll_midi(void)`
`279`	`279`	`PmEvent buffer;`
`280`	`280`	`for (i = 0; i < mac_nmidiindev; i++)`
`281`	`281`	`{`
`282`		`- if(Pm_Poll(mac_midiindevlist[i]))`
	`282`	`+ while((nmess = Pm_Read(mac_midiindevlist[i], &buffer, 1)))`
`283`	`283`	`{`
`284`	`284`	`if (!throttle--)`
`285`	`285`	`goto overload;`
`286`		`- nmess = Pm_Read(mac_midiindevlist[i], &buffer, 1);`
`287`	`286`	`if (nmess > 0)`
`288`	`287`	`{`
`289`	`288`	`int status = Pm_MessageStatus(buffer.message);`
`@@ -332,8 +331,12 @@ void sys_poll_midi(void)`
`332`	`331`	`break;`
`333`	`332`	`}`
`334`	`333`	`}`
`335`		`- else if (nmess != pmBufferOverflow)`
`336`		`- break;`
	`334`	`+ else`
	`335`	`+ {`
	`336`	`+ error("%s", Pm_GetErrorText(nmess));`
	`337`	`+ if (nmess != pmBufferOverflow)`
	`338`	`+ break;`
	`339`	`+ }`
`337`	`340`	`}`
`338`	`341`	`}`
`339`	`342`	`overload: ;`