From fd0c6044d2170bc2c10822c6fb3965932547b836 Mon Sep 17 00:00:00 2001 From: Bob van Loosen Date: Sun, 18 Nov 2012 15:38:45 +0100 Subject: [PATCH] added: connect socket --- src/bitvis.cpp | 17 ++++++++++++++++- src/bitvis.h | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/bitvis.cpp b/src/bitvis.cpp index 165e414..b7cdf8a 100644 --- a/src/bitvis.cpp +++ b/src/bitvis.cpp @@ -119,6 +119,8 @@ void CBitVis::Process() while (!m_stop) { + bool didconnect = false; + if (m_jackclient.ExitStatus()) { LogError("Jack client exited with code %i reason: \"%s\"", @@ -129,13 +131,26 @@ void CBitVis::Process() if (!m_jackclient.IsConnected() && GetTimeUs() - lastconnect > CONNECTINTERVAL) { m_jackclient.Connect(); - lastconnect = GetTimeUs(); + didconnect = true; } uint8_t msg; while ((msg = m_jackclient.GetMessage()) != MsgNone) LogDebug("got message %s from jack client", MsgToString(msg)); + if (!m_socket.IsOpen() && GetTimeUs() - lastconnect > CONNECTINTERVAL) + { + if (m_socket.Open("192.168.88.117", 1337) == FAIL) + { + LogError("Failed to connect: %s", m_socket.GetError().c_str()); + m_socket.Close(); + } + didconnect = true; + } + + if (didconnect) + lastconnect = GetTimeUs(); + if (m_jackclient.IsConnected()) { ProcessAudio(); diff --git a/src/bitvis.h b/src/bitvis.h index e5b7045..8d28d40 100644 --- a/src/bitvis.h +++ b/src/bitvis.h @@ -21,6 +21,7 @@ #include "jackclient.h" #include "fft.h" +#include "util/tcpsocket.h" class CBitVis { @@ -44,6 +45,8 @@ class CBitVis int m_samplecounter; int m_nrffts; + CTcpClientSocket m_socket; + void SetupSignals(); void ProcessSignalfd(); void ProcessAudio();