Hi!,
I have diffed the jack related source between 0.45-5 and 0.46-0.
I see added test on null pointers, but I have questions about a for
loop mixed with this test, or the fact that some actions are still
done where there are null buffers.
I will check every block later, and find the problem.
Kind regards,
Xavier Miller.
--- ./pd-0.45-5/src/s_audio_jack.c Mon Apr 7 03:38:59 2014
+++ ./pd-0.46-0/src/s_audio_jack.c Mon Aug 18 04:07:28 2014
@@ -12,6 +12,7 @@
#include <string.h>
#include "m_pd.h"
#include "s_stuff.h"
+#include <jack/weakjack.h>
#include <jack/jack.h>
#include <regex.h>
@@ -53,15 +54,15 @@
{
for (j = 0; j < sys_outchannels; j++)
{
- out = jack_port_get_buffer (output_port[j], nframes);
- memcpy(out, jack_outbuf + (j * BUF_JACK),
- sizeof (jack_default_audio_sample_t) * nframes);
+ if (out = jack_port_get_buffer(output_port[j], nframes))
+ memcpy(out, jack_outbuf + (j * BUF_JACK),
+ sizeof (jack_default_audio_sample_t) * nframes);
}
for (j = 0; j < sys_inchannels; j++)
{
- in = jack_port_get_buffer( input_port[j], nframes);
- memcpy(jack_inbuf + (j * BUF_JACK), in,
- sizeof (jack_default_audio_sample_t) * nframes);
+ if (in = jack_port_get_buffer(input_port[j], nframes))
+ memcpy(jack_inbuf + (j * BUF_JACK), in,
+ sizeof (jack_default_audio_sample_t) * nframes);
}
}
else
@@ -70,32 +71,32 @@
t_sample*data;
for (j = 0; j < sys_outchannels; j++)
{
- out = jack_port_get_buffer (output_port[j], nframes);
- data = jack_outbuf + (j * BUF_JACK);
- for(frame=0; frame<nframes; frame++)
+ if (out = jack_port_get_buffer (output_port[j], nframes))
{
- *out++=*data++;
+ data = jack_outbuf + (j * BUF_JACK);
+ for (frame=0; frame<nframes; frame++)
+ *out++ = *data++;
}
}
for (j = 0; j < sys_inchannels; j++)
{
- in = jack_port_get_buffer( input_port[j], nframes);
- data = jack_inbuf + (j * BUF_JACK);
- for(frame=0; frame<nframes; frame++)
+ if (in = jack_port_get_buffer( input_port[j], nframes))
{
- *data++=*in++;
+ data = jack_inbuf + (j * BUF_JACK);
+ for (frame=0; frame<nframes; frame++)
+ *data++ = *in++;
}
}
}
jack_filled -= nframes;
}
else
- { /* PD could not keep up ! */
+ { /* PD could not keep up ! */
if (jack_started) jack_dio_error = 1;
for (j = 0; j < outport_count; j++)
{
- out = jack_port_get_buffer (output_port[j], nframes);
- memset(out, 0, sizeof (float) * nframes);
+ if (out = jack_port_get_buffer (output_port[j], nframes))
+ memset(out, 0, sizeof (float) * nframes);
memset(jack_outbuf + j * BUF_JACK, 0, BUF_JACK * sizeof(t_sample));
}
jack_filled = 0;
@@ -125,6 +126,7 @@
{
t_sample *fp;
for (chan = 0; chan < sys_inchannels; chan++)
+ if (in[chan])
{
for (fp = sys_soundin + chan*DEFDACBLKSIZE,
jp = in[chan] + n, j=0; j < DEFDACBLKSIZE; j++)
@@ -138,6 +140,7 @@
}
(*jack_callback)();
for (chan = 0; chan < sys_outchannels; chan++)
+ if (out[chan])
{
for (fp = sys_soundout + chan*DEFDACBLKSIZE, jp = out[chan] + n,
j=0; j < DEFDACBLKSIZE; j++)
@@ -303,9 +306,9 @@
jack_status_t status;
#ifdef __APPLE__
- if (NULL==jack_client_open)
+ if (!jack_client_open)
{
- error("JACK framework not available");
+ error("Can't open Jack (it seems not to be installed on this Mac)");
return 1;
}
#endif
_______________________________________________
[email protected] mailing list
UNSUBSCRIBE and account-management ->
http://lists.puredata.info/listinfo/pd-list
