move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work)
This commit is contained in:
parent
e435f22793
commit
f4cf283f26
|
@ -17,7 +17,7 @@ export ARDOUR_DATA_PATH=$TOP:$TOP/build:$TOP/gtk2_ardour:$TOP/build/gtk2_ardour:
|
||||||
export ARDOUR_MIDIMAPS_PATH=$TOP/midi_maps:.
|
export ARDOUR_MIDIMAPS_PATH=$TOP/midi_maps:.
|
||||||
export ARDOUR_MCP_PATH=$TOP/mcp:.
|
export ARDOUR_MCP_PATH=$TOP/mcp:.
|
||||||
export ARDOUR_EXPORT_FORMATS_PATH=$TOP/export:.
|
export ARDOUR_EXPORT_FORMATS_PATH=$TOP/export:.
|
||||||
export ARDOUR_BACKEND_PATH=$TOP/build/libs/ardour
|
export ARDOUR_BACKEND_PATH=$libs/backends/jack
|
||||||
|
|
||||||
#
|
#
|
||||||
# even though we set the above variables, ardour requires that these
|
# even though we set the above variables, ardour requires that these
|
||||||
|
|
|
@ -17,9 +17,9 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ardour/jack_connection.h"
|
#include "jack_connection.h"
|
||||||
#include "ardour/jack_audiobackend.h"
|
#include "jack_audiobackend.h"
|
||||||
#include "ardour/jack_portengine.h"
|
#include "jack_portengine.h"
|
||||||
|
|
||||||
using namespace ARDOUR;
|
using namespace ARDOUR;
|
||||||
|
|
|
@ -31,10 +31,10 @@
|
||||||
#include "ardour/session.h"
|
#include "ardour/session.h"
|
||||||
#include "ardour/types.h"
|
#include "ardour/types.h"
|
||||||
|
|
||||||
#include "ardour/jack_audiobackend.h"
|
#include "jack_audiobackend.h"
|
||||||
#include "ardour/jack_connection.h"
|
#include "jack_connection.h"
|
||||||
#include "ardour/jack_portengine.h"
|
#include "jack_portengine.h"
|
||||||
#include "ardour/jack_utils.h"
|
#include "jack_utils.h"
|
||||||
|
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
|
|
||||||
#include "pbd/epa.h"
|
#include "pbd/epa.h"
|
||||||
|
|
||||||
#include "ardour/jack_connection.h"
|
#include "jack_connection.h"
|
||||||
#include "ardour/jack_utils.h"
|
#include "jack_utils.h"
|
||||||
|
|
||||||
#define GET_PRIVATE_JACK_POINTER(j) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return; }
|
#define GET_PRIVATE_JACK_POINTER(j) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return; }
|
||||||
#define GET_PRIVATE_JACK_POINTER_RET(j,r) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return r; }
|
#define GET_PRIVATE_JACK_POINTER_RET(j,r) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return r; }
|
|
@ -22,8 +22,9 @@
|
||||||
|
|
||||||
#include "pbd/error.h"
|
#include "pbd/error.h"
|
||||||
|
|
||||||
#include "ardour/jack_portengine.h"
|
#include "jack_portengine.h"
|
||||||
#include "ardour/jack_connection.h"
|
#include "jack_connection.h"
|
||||||
|
|
||||||
#include "ardour/port_manager.h"
|
#include "ardour/port_manager.h"
|
||||||
|
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
|
@ -18,10 +18,6 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef WAF_BUILD
|
|
||||||
#include "libardour-config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_ALSA
|
#ifdef HAVE_ALSA
|
||||||
#include <alsa/asoundlib.h>
|
#include <alsa/asoundlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -51,7 +47,7 @@
|
||||||
#include "pbd/file_utils.h"
|
#include "pbd/file_utils.h"
|
||||||
#include "pbd/search_path.h"
|
#include "pbd/search_path.h"
|
||||||
|
|
||||||
#include "ardour/jack_utils.h"
|
#include "jack_utils.h"
|
||||||
|
|
||||||
#ifdef __APPLE
|
#ifdef __APPLE
|
||||||
#include <CFBundle.h>
|
#include <CFBundle.h>
|
51
libs/backends/jack/wscript
Normal file
51
libs/backends/jack/wscript
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
from waflib.extras import autowaf as autowaf
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import re
|
||||||
|
|
||||||
|
# Library version (UNIX style major, minor, micro)
|
||||||
|
# major increment <=> incompatible changes
|
||||||
|
# minor increment <=> compatible changes (additions)
|
||||||
|
# micro increment <=> no interface changes
|
||||||
|
JACKBACKEND_VERSION = '1.0.0'
|
||||||
|
I18N_PACKAGE = 'jack-backend'
|
||||||
|
|
||||||
|
# Mandatory variables
|
||||||
|
top = '.'
|
||||||
|
out = 'build'
|
||||||
|
|
||||||
|
def options(opt):
|
||||||
|
autowaf.set_options(opt)
|
||||||
|
|
||||||
|
def configure(conf):
|
||||||
|
autowaf.configure(conf)
|
||||||
|
|
||||||
|
def build(bld):
|
||||||
|
obj = bld(features = 'cxx cxxshlib')
|
||||||
|
obj.source = [
|
||||||
|
'jack_api.cc',
|
||||||
|
'jack_connection.cc',
|
||||||
|
'jack_audiobackend.cc',
|
||||||
|
'jack_portengine.cc',
|
||||||
|
'jack_utils.cc'
|
||||||
|
]
|
||||||
|
obj.includes = ['.']
|
||||||
|
obj.cxxflags = [ '-fPIC' ]
|
||||||
|
obj.name = 'jack_audiobackend'
|
||||||
|
obj.target = 'jack_audiobackend'
|
||||||
|
obj.uselib = [ 'JACK' ]
|
||||||
|
obj.use = 'ardour libpbd'
|
||||||
|
obj.vnum = JACKBACKEND_VERSION
|
||||||
|
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
|
||||||
|
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"']
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# device discovery code in the jack backend needs ALSA
|
||||||
|
# on Linux.
|
||||||
|
#
|
||||||
|
|
||||||
|
if re.search ("linux", sys.platform) != None:
|
||||||
|
obj.uselib += [ 'ALSA' ]
|
||||||
|
|
27
libs/backends/wscript
Normal file
27
libs/backends/wscript
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
from waflib.extras import autowaf as autowaf
|
||||||
|
import os
|
||||||
|
|
||||||
|
# Mandatory variables
|
||||||
|
top = '.'
|
||||||
|
out = 'build'
|
||||||
|
|
||||||
|
backends = [ 'jack' ]
|
||||||
|
|
||||||
|
def options(opt):
|
||||||
|
autowaf.set_options(opt)
|
||||||
|
|
||||||
|
def sub_config_and_use(conf, name, has_objects = True):
|
||||||
|
conf.recurse(name)
|
||||||
|
autowaf.set_local_lib(conf, name, has_objects)
|
||||||
|
|
||||||
|
def configure(conf):
|
||||||
|
autowaf.set_recursive()
|
||||||
|
autowaf.configure(conf)
|
||||||
|
|
||||||
|
for i in backends:
|
||||||
|
sub_config_and_use(conf, i)
|
||||||
|
|
||||||
|
def build(bld):
|
||||||
|
for i in backends:
|
||||||
|
bld.recurse(i)
|
Loading…
Reference in New Issue
Block a user