Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 09:57:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

send client their own packet for solo mixer testing

Browse source
This commit is contained in:
Stephen Birarda 2013-02-13 16:14:04 -08:00
parent 4fc9dd6323
commit 4270cfe2b4
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mixer/src/main.cpp
View file

@ -171,10 +171,11 @@ void *sendBuffer(void *args)
} }
for(int as = 0; as < BUFFER_LENGTH_SAMPLES; as++) { for(int as = 0; as < BUFFER_LENGTH_SAMPLES; as++) {
long longSample = previousOutput != NULL // long longSample = previousOutput != NULL
? masterMix[as] - previousOutput[as] // ? masterMix[as] - previousOutput[as]
: masterMix[as]; // : masterMix[as];
long longSample = masterMix[as];
int16_t shortSample; int16_t shortSample;
@ -195,7 +196,7 @@ void *sendBuffer(void *args)
} }
sentBytes = audioSocket->send(agents[a].address, agents[a].port, (void *) clientMix, BUFFER_LENGTH_BYTES); sentBytes = audioSocket->send(agents[a].address, agents[a].port, clientMix, BUFFER_LENGTH_BYTES);
if (sentBytes < BUFFER_LENGTH_BYTES) { if (sentBytes < BUFFER_LENGTH_BYTES) {
std::cout << "Error sending mix packet! " << sentBytes << strerror(errno) << "\n"; std::cout << "Error sending mix packet! " << sentBytes << strerror(errno) << "\n";

5
shared/src/UDPSocket.cpp
View file

@ -51,10 +51,7 @@ UDPSocket::~UDPSocket() {
// Receive data on this socket with retrieving address of sender // Receive data on this socket with retrieving address of sender
bool UDPSocket::receive(void *receivedData, int *receivedBytes) { bool UDPSocket::receive(void *receivedData, int *receivedBytes) {
*receivedBytes = recvfrom(handle, receivedData, MAX_BUFFER_LENGTH_BYTES, return receive(&senderAddress, receivedData, receivedBytes);
0, (sockaddr *)&senderAddress, &addLength);
return (*receivedBytes > 0);
} }
// Receive data on this socket with the address of the sender // Receive data on this socket with the address of the sender