Skip to content

Commit

Permalink
Pass OSCMessage by reference instead of value.
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasBleijendaal committed Jul 23, 2016
1 parent 55cf652 commit 14530e5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
12 changes: 7 additions & 5 deletions Arduino/libraries/Edt-lib/OSC.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class EdtOSCSourceObject {
public:
virtual OSCMessage generateMessage() = 0;
virtual OSCMessage * generateMessage() = 0;
};

class EdtOSCObject : public OSCMessageHandler {};
Expand Down Expand Up @@ -99,14 +99,16 @@ class EdtOSC
}
}

void send(OSCMessage message) {
void send(OSCMessage * message) {
_udpHandle->beginPacket(_remoteIP, _remotePort);

message.add<int>(++_messages);
message->add<int>(++_messages);

message.send(*_udpHandle);
message->send(*_udpHandle);
_udpHandle->endPacket();
message.empty();
message->empty();

free(message);
}
private:
UDP * _udpHandle;
Expand Down
6 changes: 3 additions & 3 deletions Arduino/libraries/Edt-lib/Trak.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ class EdtAITrak : public EdtOSCSourceObject {
_oscAddress = oscAddress;
};

OSCMessage generateMessage() {
OSCMessage message = OSCMessage(_oscAddress);
OSCMessage * generateMessage() {
OSCMessage * message = new OSCMessage(_oscAddress);

for (int i = 0; i < 6; i++) {
data.buffer[i] = (float)analogRead(_config.buffer[i]) / 1023.0;
message.add<float>(data.buffer[i]);
message->add<float>(data.buffer[i]);
}

return message;
Expand Down

0 comments on commit 14530e5

Please sign in to comment.