From fac8f8e7d8fa5c9a2283fbfc497c6b2c529d0f5d Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 8 Mar 2018 22:42:00 -0500
Subject: [PATCH] Fix AudioInterface timing issue, fix Bridge compiliation on
 Linux

---
 src/Core/AudioInterface.cpp | 4 ++--
 src/bridge.cpp              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Core/AudioInterface.cpp b/src/Core/AudioInterface.cpp
index 7312fb84..ca059414 100644
--- a/src/Core/AudioInterface.cpp
+++ b/src/Core/AudioInterface.cpp
@@ -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();
diff --git a/src/bridge.cpp b/src/bridge.cpp
index 64fb822e..63fb2c28 100644
--- a/src/bridge.cpp
+++ b/src/bridge.cpp
@@ -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) {