From a465c2bd366f039895787e70cafd929fd2e501be Mon Sep 17 00:00:00 2001 From: Viktor Wilhelmsson Date: Tue, 26 Mar 2019 13:36:08 +0100 Subject: [PATCH] Remove GPL dependency from JackTools. JackTools is a part of the LGPL licenced jacklib and should not pull in GPL licensed code. --- common/JackNetOneDriver.cpp | 2 +- common/JackTools.cpp | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp index 72cc879d..3985e475 100644 --- a/common/JackNetOneDriver.cpp +++ b/common/JackNetOneDriver.cpp @@ -287,7 +287,7 @@ int JackNetOneDriver::Read() } if ((netj.num_lost_packets * netj.period_size / netj.sample_rate) > 2) - JackTools::ThrowJackNetException(); + throw JackNetException(); //netjack_read(&netj, netj.period_size); JackDriver::CycleTakeBeginTime(); diff --git a/common/JackTools.cpp b/common/JackTools.cpp index 84a49950..f5be038e 100644 --- a/common/JackTools.cpp +++ b/common/JackTools.cpp @@ -18,7 +18,7 @@ */ #include "JackConstants.h" -#include "JackDriverLoader.h" +#include "driver_interface.h" #include "JackTools.h" #include "JackError.h" #include @@ -44,11 +44,6 @@ namespace Jack { #endif } - void JackTools::ThrowJackNetException() - { - throw JackNetException(); - } - int JackTools::MkDir(const char* path) { #ifdef WIN32 @@ -299,4 +294,3 @@ void BuildClientPath(char* path_to_so, int path_len, const char* so_name) } // end of namespace - -- 2.11.4.GIT