diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-27 12:44:23 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-27 12:44:23 -0500 |
| commit | ac4d691fe9d45c7606e865bba07405f6476a1565 (patch) | |
| tree | d4e4e0417028316301c31cab6127e8028ab23741 | |
| parent | f1db14923e5d14331d1bf869d32862a2cf3460bb (diff) | |
remove unintended linkage between libmidipp and jack
| -rw-r--r-- | libs/midi++2/midi++/ipmidi_port.h | 2 | ||||
| -rw-r--r-- | libs/midi++2/midi++/types.h | 5 | ||||
| -rw-r--r-- | libs/midi++2/port.cc | 3 | ||||
| -rw-r--r-- | libs/midi++2/wscript | 5 |
4 files changed, 4 insertions, 11 deletions
diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h index c077170026..8d5cecdf11 100644 --- a/libs/midi++2/midi++/ipmidi_port.h +++ b/libs/midi++2/midi++/ipmidi_port.h @@ -41,8 +41,6 @@ #include <glibmm/threads.h> -#include <jack/types.h> - #include "pbd/xml++.h" #include "pbd/crossthread.h" #include "pbd/signals.h" diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h index 185e1e6f3f..598bb8ab5a 100644 --- a/libs/midi++2/midi++/types.h +++ b/libs/midi++2/midi++/types.h @@ -20,7 +20,6 @@ #ifndef __midi_types_h__ #define __midi_types_h__ -#include <jack/jack.h> #include <inttypes.h> namespace MIDI { @@ -32,8 +31,8 @@ namespace MIDI { typedef uint32_t timestamp_t; /** XXX: dupes from libardour */ - typedef int64_t framecnt_t; - typedef jack_nframes_t pframes_t; + typedef int64_t framecnt_t; + typedef uint32_t pframes_t; enum eventType { none = 0x0, diff --git a/libs/midi++2/port.cc b/libs/midi++2/port.cc index 1480202867..90ec260eae 100644 --- a/libs/midi++2/port.cc +++ b/libs/midi++2/port.cc @@ -22,9 +22,6 @@ #include <fcntl.h> #include <errno.h> -#include <jack/jack.h> -#include <jack/midiport.h> - #include "pbd/xml++.h" #include "pbd/error.h" #include "pbd/failed_constructor.h" diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index 0abbab7d40..000cc39e5f 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -50,7 +50,6 @@ def configure(conf): 'midipp', MAJOR, MINOR, MICRO) autowaf.configure(conf) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) - autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2') autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') @@ -64,13 +63,13 @@ def build(bld): obj = bld.shlib(features = 'cxx cxxshlib', source=libmidi_sources) else: obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources) - obj.cxxflags = [ '-fPIC', '-DWITH_JACK_MIDI' ] + obj.cxxflags = [ '-fPIC' ] # everybody loves JACK obj.export_includes = ['.'] obj.includes = ['.', '../surfaces/control_protocol', '../ardour' ] obj.name = 'libmidipp' obj.target = 'midipp' - obj.uselib = 'GLIBMM SIGCPP XML JACK OSX' + obj.uselib = 'GLIBMM SIGCPP XML OSX' obj.use = 'libpbd libevoral libtimecode' obj.vnum = LIBMIDIPP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') |