remove use of JACK headers to allow building on systems without JACK

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 465de04127a1b013add7fe8d5e538f532bb77b08..29cfa4b354665cf46f923f90291df11d0f223926 100644 (file)
--- 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 1688a2a36d2176dfc876fc3cd2ca3af38f66d06e..9afd0167e3bd040154180047289de698b6a92884 100644 (file)
--- 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 5fb9a7efc3bd321213eb112914611fcc28dda76e..6a05314843180f077803af2235d68804347c0f6e 100644 (file)
--- 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 7e80055f945a5c74800cfc4f45ce258ccb7535ab..6df10c3f9a1fe20711471b768379971edd042819 100644 (file)
--- 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 bc5d26fb805431059246f5f29dd46c820ea125d0..19bebd103fe4e3c3d13fb439b1b53f71ccc68585 100644 (file)
--- 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));