comparison core/Scope.cpp @ 305:b57d76dcc9ae prerelease

Merge
author Giulio Moro <giuliomoro@yahoo.it>
date Fri, 27 May 2016 17:51:34 +0100
parents 421a69d42943
children efc9a9f8e63d
comparison
equal deleted inserted replaced
304:d2b7df6b355b 305:b57d76dcc9ae
29 // used for sending raw frame data 29 // used for sending raw frame data
30 socket.setServer("127.0.0.1"); 30 socket.setServer("127.0.0.1");
31 socket.setPort(SCOPE_UDP_PORT); 31 socket.setPort(SCOPE_UDP_PORT);
32 32
33 // setup the auxiliary tasks 33 // setup the auxiliary tasks
34 scopeTriggerTask = Bela_createAuxiliaryTask(Scope::triggerTask, BEAGLERT_AUDIO_PRIORITY-2, "scopeTriggerTask", this, true); 34 scopeTriggerTask = Bela_createAuxiliaryTask(Scope::triggerTask, BELA_AUDIO_PRIORITY-2, "scopeTriggerTask", this, true);
35 scopeSendBufferTask = Bela_createAuxiliaryTask(Scope::sendBufferTask, BEAGLERT_AUDIO_PRIORITY-1, "scopeSendBufferTask", this); 35 scopeSendBufferTask = Bela_createAuxiliaryTask(Scope::sendBufferTask, BELA_AUDIO_PRIORITY-1, "scopeSendBufferTask", this);
36 36
37 // send an OSC message to address /scope-setup 37 // send an OSC message to address /scope-setup
38 // then wait 1 second for a reply on /scope-setup-reply 38 // then wait 1 second for a reply on /scope-setup-reply
39 bool handshakeRecieved = false; 39 bool handshakeRecieved = false;
40 oscClient.sendMessageNow(oscClient.newMessage.to("/scope-setup").add((int)numChannels).add(sampleRate).end()); 40 oscClient.sendMessageNow(oscClient.newMessage.to("/scope-setup").add((int)numChannels).add(sampleRate).end());