Unverified Commit 549880aa authored by cchafe's avatar cchafe Committed by GitHub
Browse files

Merge branch 'master' into chris

parents 3ce5cf7b e73e98e5
os:
- linux
- osx
language:
- cpp
# force updated ubuntu distribution with up-to-date gcc
dist: bionic
branches:
- master
env:
global:
- PKGS_OSX="jack qt rt-audio"
addons:
apt:
update: true
packages:
- qt5-default
- qttools5-dev-tools
- libjack-dev
- librtaudio-dev
before_script:
# manually install brew packages as addon: homebrew is broken in the default osx image
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install $PKGS_OSX; fi
# mac: workaround for homebrew qmake not being symlinked into $PATH
# see https://stackoverflow.com/questions/48847505/why-cant-i-use-qmake-on-mac-after-installing-it
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi
script:
- cd src
- ./build
after_success:
- echo "Success!"
after_failure:
- echo "Something went wrong :("
......@@ -16,7 +16,7 @@ And as of spring 2020 it moved back to GitHub for the current development.
## Links ##
* Preliminary [Documentation](http://ccrma.stanford.edu/groups/soundwire/software/jacktrip/) and [API](http://ccrma.stanford.edu/groups/soundwire/software/jacktrip/annotated.html).
* Subscribe to the [Mailing List](http://groups.google.com/group/jacktrip-users).
* [CCRMA](http://ccrma.stanford.edu/) .
* [CCRMA](http://ccrma.stanford.edu/).
* [SoundWIRE group](http://ccrma.stanford.edu/groups/soundwire/).
* [Juan-Pablo Caceres](https://ccrma.stanford.edu/~jcaceres/).
......
......@@ -44,6 +44,8 @@
#include "jacktrip_types.h"
#include <atomic>
//using namespace JackTripNamespace;
......
......@@ -51,7 +51,7 @@
#include <winsock2.h> //cc need SD_SEND
#include <ws2tcpip.h> // for IPv6
#endif
#if defined (__LINUX__) || (__MAC__OSX__)
#if defined (__LINUX__) || (__MAC_OSX__)
#include <sys/socket.h> // for POSIX Sockets
#endif
......@@ -101,7 +101,7 @@ UdpDataProtocol::~UdpDataProtocol()
void UdpDataProtocol::setPeerAddress(const char* peerHostOrIP)
{
// Get DNS Address
#if defined (__LINUX__) || (__MAC__OSX__)
#if defined (__LINUX__) || (__MAC_OSX__)
//Don't make the following code conditional on windows
//(Addresses a weird timing bug when in hub client mode)
if (!mPeerAddress.setAddress(peerHostOrIP)) {
......@@ -113,7 +113,7 @@ void UdpDataProtocol::setPeerAddress(const char* peerHostOrIP)
}
//cout << "UdpDataProtocol::setPeerAddress IP Address Number: "
// << mPeerAddress.toString().toStdString() << endl;
#if defined (__LINUX__) || (__MAC__OSX__)
#if defined (__LINUX__) || (__MAC_OSX__)
}
#endif
......@@ -576,12 +576,6 @@ void UdpDataProtocol::run()
break; }
case SENDER : {
/*
* version skew? testing without this line
//Make sure we don't start sending packets too soon.
QThread::msleep(100);
*/
//-----------------------------------------------------------------------------------
while ( !mStopped )
{
// OLD CODE WITHOUT REDUNDANCY -----------------------------------------------------
......@@ -640,7 +634,7 @@ void UdpDataProtocol::printUdpWaitedTooLong(int wait_msec)
{
int wait_time = 30; // msec
if ( !(wait_msec%wait_time) ) {
std::cerr << "UDP waiting too long (more than " << wait_time << "ms)..." << endl;
std::cerr << "UDP waiting too long (more than " << wait_time << "ms) for " << mPeerAddress.toString().toStdString() << "..." << endl;
}
}
......
......@@ -17,9 +17,6 @@ if [[ $platform == 'linux' ]]; then
if hash qmake-qt5 2>/dev/null; then
echo "Using qmake-qt5"
QCMD=qmake-qt5
elif hash qmake-qt4 2>/dev/null; then
echo "Using qmake-qt4"
QCMD=qmake-qt4
elif hash qmake 2>/dev/null; then #in case qt was compiled by user
echo "Using qmake"
QCMD=qmake
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment