diff --git a/src/eventhandler.hxx b/src/eventhandler.hxx index 94c1a83..d8e7bd4 100644 --- a/src/eventhandler.hxx +++ b/src/eventhandler.hxx @@ -2,6 +2,7 @@ #ifndef LUPPP_EVENT_HANDLER_H #define LUPPP_EVENT_HANDLER_H +#include "event.hxx" #include extern char* processDspMem; diff --git a/src/eventhandlerdsp.cxx b/src/eventhandlerdsp.cxx index f936428..774e515 100644 --- a/src/eventhandlerdsp.cxx +++ b/src/eventhandlerdsp.cxx @@ -17,7 +17,7 @@ using namespace std; extern Jack* jack; -extern void handleDspEvents() +void handleDspEvents() { uint availableRead = jack_ringbuffer_read_space( rbToDsp ); diff --git a/src/jack.cxx b/src/jack.cxx index d7ca755..a10d516 100644 --- a/src/jack.cxx +++ b/src/jack.cxx @@ -5,6 +5,8 @@ #include #include +#include "eventhandler.hxx" + using namespace std; @@ -47,8 +49,8 @@ void Jack::activate() int Jack::process (jack_nframes_t nframes) { - // update values from the ringbuffer - //processDsp(); + // do events from the ringbuffer + handleDspEvents(); // get buffers buffers.audio[Buffers::MASTER_INPUT] = (float*)jack_port_get_buffer( masterInput , nframes); diff --git a/src/main.cxx b/src/main.cxx index 84f1e0a..cc3f9c2 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -9,6 +9,7 @@ // Internal #include "gui.hxx" #include "jack.hxx" +#include "event.hxx" char* processDspMem = 0; @@ -21,6 +22,13 @@ Jack* jack = 0; int main() { + // allocate data to read from + processDspMem = (char*)malloc( sizeof(EventBase) ); + processOscMem = (char*)malloc( sizeof(EventBase) ); + + rbToDsp = jack_ringbuffer_create( 2000 * sizeof(EventBase)); + rbToGui = jack_ringbuffer_create( 2000 * sizeof(EventBase)); + jack = new Jack();