From b9eafba2b8c9469d4442016f89381fb123f74bfe Mon Sep 17 00:00:00 2001 From: sletz Date: Thu, 10 Mar 2011 16:44:47 +0000 Subject: [PATCH] Compile on Linux again. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4174 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackDummyDriver.cpp | 2 +- common/netjack.c | 7 ------- example-clients/connect.c | 1 + 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/common/JackDummyDriver.cpp b/common/JackDummyDriver.cpp index c4133118..fb996a11 100644 --- a/common/JackDummyDriver.cpp +++ b/common/JackDummyDriver.cpp @@ -56,7 +56,7 @@ int JackDummyDriver::Open(jack_nframes_t buffer_size, fEngineControl->fPeriod = 0; fEngineControl->fComputation = 500 * 1000; fEngineControl->fConstraint = 500 * 1000; - int buffer_size = (fWaitTime * fEngineControl->fSampleRate) / 1000000.0f; + int buffer_size = int((fWaitTime * fEngineControl->fSampleRate) / 1000000.0f); if (buffer_size > BUFFER_SIZE_MAX) { buffer_size = BUFFER_SIZE_MAX; jack_error("Buffer size set to %d ", BUFFER_SIZE_MAX); diff --git a/common/netjack.c b/common/netjack.c index 98c22604..ce97da5c 100644 --- a/common/netjack.c +++ b/common/netjack.c @@ -25,7 +25,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $ */ - #include #include #include @@ -48,8 +47,6 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $ #include #endif -#include "netjack.h" - #ifdef __linux__ #include "config.h" #endif @@ -58,10 +55,6 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $ #include #endif -#if HAVE_CELT -#include -#endif - #include "netjack.h" #include "netjack_packet.h" diff --git a/example-clients/connect.c b/example-clients/connect.c index d0a05b6b..a4132cea 100644 --- a/example-clients/connect.c +++ b/example-clients/connect.c @@ -26,6 +26,7 @@ #include #include #include +#include jack_port_t *input_port; jack_port_t *output_port;