diff --git a/SpiralSound/ChannelHandler.C b/SpiralSound/ChannelHandler.C index a79cc45..f6bfdfa 100644 --- a/SpiralSound/ChannelHandler.C +++ b/SpiralSound/ChannelHandler.C @@ -18,6 +18,8 @@ #include "ChannelHandler.h" #include +#include +#include using namespace std; diff --git a/SpiralSound/Plugins/JackPlugin/JackPlugin.C b/SpiralSound/Plugins/JackPlugin/JackPlugin.C index 24ee573..9dcc5c2 100644 --- a/SpiralSound/Plugins/JackPlugin/JackPlugin.C +++ b/SpiralSound/Plugins/JackPlugin/JackPlugin.C @@ -39,7 +39,10 @@ inline void JackClient::JackProcess_i(jack_nframes_t nframes) if (jack_port_connected(m_InputPortMap[n]->Port)) { sample_t *in = (sample_t *) jack_port_get_buffer(m_InputPortMap[n]->Port, nframes); - memcpy (m_InputPortMap[n]->Buf, in, sizeof (sample_t) * GetBufferSize()); + + assert( m_InputPortMap[n]->Buf ); + + memcpy( m_InputPortMap[n]->Buf, in, sizeof (sample_t) * GetBufferSize()); } } @@ -50,6 +53,9 @@ inline void JackClient::JackProcess_i(jack_nframes_t nframes) if ((m_OutputPortMap[n]->Buf) && (!host->PAUSED)) { sample_t *out = (sample_t *) jack_port_get_buffer(m_OutputPortMap[n]->Port, nframes); + + assert( m_OutputPortMap[n]->Buf ); + memcpy (out, m_OutputPortMap[n]->Buf, sizeof (sample_t) * GetBufferSize()); } else // no output availible, clear @@ -209,6 +215,8 @@ bool JackClient::Attach() for (int n=0; n #include #include - +#include #include #include #include diff --git a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C index e984510..3d4685b 100644 --- a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C +++ b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C @@ -20,6 +20,7 @@ #include #include #include "SpiralIcon.xpm" +#include using namespace std; diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C index ebc5d75..1be0048 100644 --- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C +++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C @@ -20,6 +20,7 @@ #include #include #include "SpiralIcon.xpm" +#include using namespace std; diff --git a/SpiralSound/Plugins/SpiralPlugin.h b/SpiralSound/Plugins/SpiralPlugin.h index d153cf7..f63e6b4 100644 --- a/SpiralSound/Plugins/SpiralPlugin.h +++ b/SpiralSound/Plugins/SpiralPlugin.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include "../Sample.h" diff --git a/SpiralSound/Sample.h b/SpiralSound/Sample.h index 5c915d2..effafee 100644 --- a/SpiralSound/Sample.h +++ b/SpiralSound/Sample.h @@ -24,6 +24,7 @@ #include #include #include +#include //#define DEBUG