From fa66d0ae38d8a2c7e4cb2d00cdb4a8cdda990999 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 10 Apr 2014 08:58:25 -0400
Subject: remove use of JACK headers to allow building on systems without JACK

---
 libs/ardour/ardour/ardour.h | 2 --
 libs/ardour/ardour/io.h     | 1 -
 libs/ardour/ardour/port.h   | 1 -
 libs/ardour/ardour/slave.h  | 1 -
 libs/ardour/port.cc         | 6 +-----
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 465de04127..29cfa4b354 100644
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -38,8 +38,6 @@
 #include "ardour/types.h"
 #include "ardour/libardour_visibility.h"
 
-#include <jack/jack.h>
-
 namespace MIDI {
 	class MachineControl;
 	class Port;
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 1688a2a36d..9afd0167e3 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 #include <cmath>
-#include <jack/jack.h>
 
 #include <glibmm/threads.h>
 
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 5fb9a7efc3..6a05314843 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -25,7 +25,6 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <jack/jack.h>
 #include <boost/utility.hpp>
 #include "pbd/signals.h"
 
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 7e80055f94..6df10c3f9a 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -24,7 +24,6 @@
 
 #include <glibmm/threads.h>
 
-#include <jack/jack.h>
 #include <ltc.h>
 
 #include "pbd/signals.h"
diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index bc5d26fb80..19bebd103f 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -21,10 +21,6 @@
 #include "libardour-config.h"
 #endif
 
-#ifndef PLATFORM_WINDOWS
-#include <jack/weakjack.h> // so that we can test for new functions at runtime
-#endif
-
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
@@ -382,7 +378,7 @@ Port::get_connected_latency_range (LatencyRange& range, bool playback) const
 
                                 boost::shared_ptr<Port> remote_port = AudioEngine::instance()->get_port_by_name (*c);
                                 if (remote_port) {
-                                        lr = remote_port->private_latency_range ((playback ? JackPlaybackLatency : JackCaptureLatency));
+                                        lr = remote_port->private_latency_range ((playback ? true : false));
                                         DEBUG_TRACE (DEBUG::Latency, string_compose (
                                                              "\t%1 <-LOCAL-> %2 : latter has latency range %3 .. %4\n",
                                                              name(), *c, lr.min, lr.max));
-- 
cgit v1.2.3