Commit Graph

316 Commits

Author SHA1 Message Date
Robin Gareus
626b2daa82 add delayline implementaion (in prep for latency compensation) 2014-06-11 16:31:29 +02:00
Robin Gareus
81182b5bf6 prepare MIDI latency measurement (backend) 2014-06-08 11:18:18 +02:00
Colin Fletcher
5399425f53 Merge branch 'export-dialog' into cairocanvas
Fix merge conflicts in:
	gtk2_ardour/export_range_markers_dialog.cc
	gtk2_ardour/wscript
	libs/ardour/ardour/export_handler.h
	libs/ardour/system_exec.cc
	libs/pbd/pbd/system_exec.h
	libs/pbd/system_exec.cc
2014-05-19 20:54:36 +01:00
Paul Davis
1b989a93c2 remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR'] 2014-04-28 21:18:02 -04:00
Paul Davis
058986f77b finish unfinished work at basing all install paths on the program name 2014-04-28 21:11:08 -04:00
Paul Davis
2cf411e4be merge (squash) with scenechange topic branch to provide MIDI-driven scene change markers 2014-04-28 19:58:24 -04:00
Robin Gareus
f678700376 amend previous commit, remove cruft, no more extern function pointers 2014-04-11 19:36:17 +02:00
Sakari Bergen
254923532b Make tests build again (fix linker issues) 2014-04-07 20:50:29 +03:00
Robin Gareus
38b32414ba remove dead code (PIChaser has been superseded with PLL,DLL) 2014-03-23 01:07:17 +01:00
Robin Gareus
543099afba rework SystemExec - use vfork wrapper (and lots of related stuff) 2014-03-13 16:58:07 +01:00
Paul Davis
495c0de4ac fix up waf build in wake of search path changes earlier today 2014-03-10 17:30:12 -04:00
Robin Gareus
912f07b919 mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64) 2014-03-04 15:25:58 +01:00
Paul Davis
b8419ae7cd use "new" VST search path code and adjust build system to reflect new source files 2014-03-02 10:53:25 -05:00
Robin Gareus
bcf6c76462 consolidate lxVST & winVST file-info code into libardour
first step and clennup before adding support for
VST shell-plugins (collections) and external scanner app...
2014-02-23 05:51:58 +01:00
Colin Fletcher
a643c9fdc0 Merge remote-tracking branch 'origin/master' into export-dialog 2014-01-25 02:30:55 +00:00
Paul Davis
6acdfc69b7 visibility macros and flush() added to SrcFileSource; merge with master 2014-01-19 17:54:47 -05:00
Robin Gareus
73c6122591 towards a SRC source + resampling during audition 2014-01-18 13:51:05 +01:00
Robin Gareus
a919ac8a86 aubio 3+4 compat 2014-01-13 09:38:24 -05:00
Paul Davis
83c0720645 remove VAMP and Rubberband from source tree 2014-01-12 15:40:48 -05:00
Paul Davis
0a2a6aaabb remove taglib from source tree (require external provision) 2014-01-12 15:40:48 -05:00
Paul Davis
5062a00c7d move -fvisibility=hidden to the top of the source tree, and remove its internal use; use libtimecode as a shared lib again 2014-01-12 15:40:47 -05:00
Robin Gareus
1eaa30b725 aubio 3+4 compat 2014-01-12 18:11:14 +01:00
Paul Davis
658bb3ccd4 finished merge of cairocanvas with windows and windows+cc branches 2014-01-10 17:11:10 -05:00
Paul Davis
3020b224fa Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there 2014-01-10 16:07:57 -05:00
Colin Fletcher
52003be369 Merge remote-tracking branch 'origin/master' into export-dialog
Fix conflicts in:
	gtk2_ardour/export_dialog.cc
	gtk2_ardour/export_dialog.h
	libs/ardour/export_handler.cc
2014-01-08 15:50:34 +00:00
Paul Davis
36c233fe6c Merge branch 'master' into cairocanvas 2014-01-07 21:37:48 -05:00
Robin Gareus
f3d858f9df fix detection of aubio library - aubio-0.4 breaks API and ABI.
ideally we'll want atleast_version='0.3.2', max_version='0.3.9'
(or anything before 0.4.0) for the time being.
but waf/autowaf don't seem to allow that.

aubio-0.3.2 was the previous minimum requirement and is
also the last release of audio-0.3.X, so we're good with
exact_version for now.
2014-01-04 19:28:15 +01:00
Paul Davis
b0e4f81eb3 merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.
Still need to add API export/visibility macros for the canvas library.
2013-12-27 14:29:06 -05:00
Tim Mayberry
be376350b5 A few basic tests for AudioEngine 2013-12-07 20:48:19 +10:00
Tim Mayberry
ccebb050e4 Fix compile when using external version of libltc 2013-12-05 20:57:36 +10:00
Paul Davis
8648a8a13b fix up wscript/build issues in exportvis after merge with master 2013-12-03 11:51:25 -05:00
Tim Mayberry
30da95b609 Remove duplicate ALSA pkgconfig 2013-12-02 21:21:25 +10:00
Paul Davis
08371ae2cf resolve merge with master (?) 2013-11-26 10:24:51 -05:00
Paul Davis
fa22520fd2 Merge branch 'master' into cairocanvas 2013-11-25 09:26:35 -05:00
Julien de Kozak
6992153ae9 fix tests compilation 2013-11-05 07:51:04 +01:00
Paul Davis
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
Nils Philippsen
5f00d2f3a7 allow linking unbundled versions of some libraries
(libltc, rubberband, taglib, vamp-sdk)
2013-10-28 09:06:09 +01:00
Paul Davis
d135c4dc3a fix merge conflicts with master 2013-10-23 08:47:57 -04:00
Paul Davis
664e715a00 merge from master 2013-10-22 15:29:44 -04:00
Tim Mayberry
5d8425c3df Remove random character at start of wscript file 2013-10-21 10:42:20 +10:00
Tim Mayberry
b97ab7d7bc Statically link libtimecode into libmidi++ instead of libardour
This is necessary to get the libmidi++ test to work as libmidi++ has
unresolved symbols in libtimecode. This was not a problem when libtimecode
was statically linked into libardour if the executable depended on both
libtimecode and libardour as the symbols would get resolved.

This is not true for the midi++ test case as it doesn't depend on libardour

Also as libmidi++ only references symbols from one object file in the
libtimecode static archive only that object file gets included/exported
from libmidi++.

This is fixed by adding a dummy reference to a symbol in the other object
file in the libtimecode static archive.
2013-10-20 09:27:35 +10:00
Paul Davis
f85c67501c reverse the visibility.h files assumptions that we don't build shared libs by default
This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.

Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.
2013-10-18 11:50:44 -04:00
Paul Davis
683496c501 use libltc and libtimecode as static libs, and upgrade to waf 1.7
This is slightly awkward. It is important that we only link once to the static lib. Doing this at executable link time did not
work, possibly because waf insisted on putting the two static libraries at the front of the link list. So instead libardour
is now the point where linkage to these libraries occurs (and nowhere else). This should never be changed unless the change
just moves the linkage point to another location.

Also fix a bug with the libardour version tha was picked up by waf 1.7
2013-10-18 11:11:59 -04:00
John Emmas
b855e5f322 Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/wscript
	libs/ardour/ardour/audioregion.h
	libs/ardour/ardour/debug.h
	libs/ardour/ardour/directory_names.h
	libs/ardour/ardour/filesystem_paths.h
	libs/ardour/ardour/session_event.h
	libs/gtkmm2ext/gtkmm2ext/utils.h
	libs/panners/1in2out/wscript
	libs/panners/2in2out/wscript
	libs/panners/vbap/wscript
	libs/pbd/pbd/debug.h
	libs/pbd/pbd/file_utils.h
	libs/pbd/pbd/pathexpand.h
	libs/pbd/pbd/ringbuffer.h
	libs/pbd/pbd/ringbufferNPT.h
	libs/pbd/pbd/search_path.h
	libs/pbd/pbd/stacktrace.h
	libs/pbd/pbd/uuid.h
	libs/pbd/pbd/uuid_boost.h
	libs/surfaces/control_protocol/control_protocol/basic_ui.h
	libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
Paul Davis
f3d2ca0d9a get everything compiling with libardour built using -fvisibility=hidden 2013-10-17 12:41:28 -04:00
Paul Davis
15471ca7dd add export control to libgtkmm2ext 2013-10-17 11:26:01 -04:00
Paul Davis
94ef2692b8 add export control to libevoral 2013-10-17 10:52:02 -04:00
Paul Davis
e2e057ce59 make small beginning on visibility control in libardour 2013-10-16 23:30:52 -04:00
Paul Davis
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
Paul Davis
69a8fc43e2 Merge branch 'master' into windows 2013-10-15 11:17:12 -04:00