Browse Source

Fix AudioInterface timing issue, fix Bridge compiliation on Linux

tags/v0.6.0
Andrew Belt 7 years ago
parent
commit
fac8f8e7d8
2 changed files with 5 additions and 5 deletions
  1. +2
    -2
      src/Core/AudioInterface.cpp
  2. +3
    -3
      src/bridge.cpp

+ 2
- 2
src/Core/AudioInterface.cpp View File

@@ -58,7 +58,7 @@ struct AudioInterfaceIO : AudioIO {
auto cond = [&] {
return (outputBuffer.size() >= (size_t) length);
};
auto timeout = std::chrono::duration<float>(0.1);
auto timeout = std::chrono::milliseconds(100);
if (audioCv.wait_for(lock, timeout, cond)) {
// Consume audio block
for (int i = 0; i < length; i++) {
@@ -188,7 +188,7 @@ void AudioInterface::step() {
auto cond = [&] {
return (audioIO.outputBuffer.size() < (size_t) audioIO.blockSize);
};
auto timeout = std::chrono::duration<float>(0.1);
auto timeout = std::chrono::milliseconds(100);
if (audioIO.engineCv.wait_for(lock, timeout, cond)) {
// Push converted output
int inLen = outputBuffer.size();


+ 3
- 3
src/bridge.cpp View File

@@ -2,16 +2,16 @@
#include "util/common.hpp"
#include "dsp/ringbuffer.hpp"

// #include <unistd.h>
#include <fcntl.h>
#ifdef ARCH_WIN
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <unistd.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <fcntl.h>
#endif


@@ -260,7 +260,7 @@ static void serverRun() {
struct sockaddr_in addr;
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
inet_pton(AF_INET, "127.0.0.1", &addr.sin_addr);
err = inet_pton(AF_INET, "127.0.0.1", &addr.sin_addr);
addr.sin_port = htons(5000);
#endif
if (err) {


Loading…
Cancel
Save