From c9e19e4e02a08659c52c3c0f76d8089b45f5bab0 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Thu, 25 Jul 2013 01:47:03 +0100 Subject: [PATCH] -Updated PLAY_SAMPLE event to LOOPER_PLAY --- src/event.hxx | 14 +++++++------- src/eventhandlerdsp.cxx | 8 ++++---- src/eventhandlergui.cxx | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/event.hxx b/src/event.hxx index 02ff07d..746c38f 100644 --- a/src/event.hxx +++ b/src/event.hxx @@ -16,11 +16,11 @@ namespace Event { enum { - PLAY_SAMPLE, MASTER_VOL, RECORD, LOOPER_LOAD, + LOOPER_PLAY, LOOPER_STATE, LOOPER_PROGRESS, LOOPER_LOOP_LENGTH, @@ -113,18 +113,18 @@ class EventLooperLoad : public EventBase } }; -class EventPlaySample : public EventBase +class EventLooperPlay : public EventBase { public: - int type() { return int(PLAY_SAMPLE); } - uint32_t size() { return sizeof(EventPlaySample); } + int type() { return int(LOOPER_PLAY); } + uint32_t size() { return sizeof(EventLooperPlay); } - int track, bufferID; + int track, scene; - EventPlaySample(int t, int id) + EventLooperPlay(int t, int s) { track = t; - bufferID = id; + scene = s; } }; diff --git a/src/eventhandlerdsp.cxx b/src/eventhandlerdsp.cxx index a645633..e1bb1c4 100644 --- a/src/eventhandlerdsp.cxx +++ b/src/eventhandlerdsp.cxx @@ -46,10 +46,10 @@ void handleDspEvents() //assert(l); l->setSample( ev.clip, (AudioBuffer*)ev.audioBuffer ); } break; } - case Event::PLAY_SAMPLE: { - if ( availableRead >= sizeof(EventPlaySample) ) { - EventPlaySample ev(0,0); - jack_ringbuffer_read( rbToDsp, (char*)&ev, sizeof(EventPlaySample) ); + case Event::LOOPER_PLAY: { + if ( availableRead >= sizeof(EventLooperPlay) ) { + EventLooperPlay ev(0,0); + jack_ringbuffer_read( rbToDsp, (char*)&ev, sizeof(EventLooperPlay) ); //jack->setPlayBuffer( ev.track, ev.bufferID ); } break; } case Event::METRONOME_ACTIVE: { diff --git a/src/eventhandlergui.cxx b/src/eventhandlergui.cxx index 0b5e395..bcddee5 100644 --- a/src/eventhandlergui.cxx +++ b/src/eventhandlergui.cxx @@ -40,10 +40,10 @@ void handleGuiEvents() jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventMasterVol) ); //jack->masterVolume = ev.vol; } break; } - case Event::PLAY_SAMPLE: { - if ( availableRead >= sizeof(EventPlaySample) ) { - EventPlaySample ev(0,0); - jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventPlaySample) ); + case Event::LOOPER_PLAY: { + if ( availableRead >= sizeof(EventLooperPlay) ) { + EventLooperPlay ev(0,0); + jack_ringbuffer_read( rbToGui, (char*)&ev, sizeof(EventLooperPlay) ); //jack->setPlayBuffer( ev.track, ev.bufferID ); } break; } case Event::METRONOME_ACTIVE: {