-Updated PLAY_SAMPLE event to LOOPER_PLAY

main
Harry van Haaren 2013-07-25 01:47:03 +01:00
parent 7c6f09291d
commit c9e19e4e02
3 changed files with 15 additions and 15 deletions

View File

@ -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;
}
};

View File

@ -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: {

View File

@ -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: {