13
0
Commit Graph

189 Commits

Author SHA1 Message Date
dd9e646b40 fix static library build 2015-06-29 14:16:42 -04:00
801af5df9e Add the new (UINTSDEFINED) preprocessor directive to all out MSVC projects (just to be on the safe side) 2015-06-09 13:18:42 +01:00
729bc00f13 no need to close a file that will not be removed (and has no name) 2015-04-29 15:01:33 -04:00
fbe673d9c7 fix #6208, negative broadcast timestamps 2015-03-22 16:12:40 +01:00
5cfa389978 explicitly close tmpfiles before unlink.
fixes issue on export tmpfiles remaining on windows
2015-03-02 23:12:06 +01:00
a5eb3bae87 add an explicit close function to sndfile
NB. if someday we want to switch back to upstream
SndfileHandle, we need to subclass wrap it.
(not sure what else is different, anyway)
2015-03-02 23:11:04 +01:00
36bbd14113 towards fixing #5711
Don’t call ::output() [here: SilenceTrimmer::process()] 
with no data to process. 

If (position + N * period-size) % chunksize == 0;
frames_left == 0 before the last call to ::output().
chunker.h:60 keeps the ProcessContext<T>::EndOfInput
flag and the SilenceTrimmer will already have done ‘in_end’ processing.
2015-01-27 23:13:55 +01:00
973d40e3ac Add support for USE_CAIRO_IMAGE_SURFACE when building with MSVC
(new preprocessor directive - greatly improves CPU loading)
2014-10-29 17:36:30 +00:00
65715dd298 Make sure all our VC projects agree that the product is called 'Mixbus3' (as opposed to just 'Mixbus')
It'd be nice if we could use 'ARDOUR::config_dir_name' for this purpose (or perhaps 'PROGRAM_VERSION'). However, neither is implemented widely enough at present to make this practical. Keep an eye on them though, as possible future strategies.
2014-08-28 07:57:20 +01:00
45afed5e9a Modify our VC project files to work with msvc32-fixup.pl 2014-08-04 09:02:17 +01:00
928881b24a Update vcproj files for changed LILV config define. 2014-07-15 15:50:12 -04:00
1b989a93c2 remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR'] 2014-04-28 21:18:02 -04:00
058986f77b finish unfinished work at basing all install paths on the program name 2014-04-28 21:11:08 -04:00
077a194430 Add the main VC project files for building Ardour3 with Microsoft Visual Studio
Note that there's no 'VS Solution' file at present and some targets haven't been built yet (e.g. 'fst')
2014-04-08 09:49:35 +01:00
e6c3cece64 remove recently added conflation of mingw64 and msvc with respect to symbol export 2014-03-02 14:59:08 -05:00
19395ac258 when mingw is mingw64, it appears that we need to use __declspec() and not __attribute__((visibility)) for export control 2014-03-01 15:16:39 -05:00
cfc9a1f22e fix broken build after addition of normalizer.cc 2014-01-14 09:33:02 -05:00
a1a3f6c826 Merge branch 'windows+cc' into cairocanvas 2014-01-13 15:05:30 +00:00
5f0492deae 'libs/audiographer' - Add a new source file (to accommodate the stuff removed from 'normalizer.h') 2014-01-13 15:01:14 +00:00
5fc1cbb65c 'libs/audiographer' - DLL visibility stuff and associated changes needed for building with MSVC. Currently includes debugging information and things that are just commented out until we have known compatibility with the other platforms (i.e. contains stuff to be removed at a later date) 2014-01-13 14:58:04 +00:00
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
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
d15fda6d75 fix merge errors with master 2014-01-10 14:53:03 -05:00
Sakari Bergen
054ead24cc Fix dither data width assertions and related tests
Fixes 32-bit export

This was broken from the start, and was broken in a new way in
52309c0c4f
2014-01-08 20:33:17 +02:00
501bfdb15a fix an errant visibility macro 2013-12-30 17:21:15 -05:00
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
3a885d6177 Only use __declspec(dllimport/dllexport) for MSVC compiler
Use the gcc visibility attributes when building with the MinGW compiler(gcc).
GCC also supports the __declspec syntax but it will not compile at the moment
until the issues(which may not even be exactly the same issues as with MSVC)
are resolved.
2013-12-05 21:11:18 +10:00
8648a8a13b fix up wscript/build issues in exportvis after merge with master 2013-12-03 11:51:25 -05:00
fa22520fd2 Merge branch 'master' into cairocanvas 2013-11-25 09:26:35 -05:00
Sakari Bergen
52309c0c4f Fix invalid assertions in AudioGrapher SampleFormatConverter
This fixes an export crash with e.g. 8-bit export
2013-11-23 18:43:54 +02:00
0cca272431 try to fix various warnings from gcc when optimization flags are enabled 2013-11-04 21:32:41 -05:00
Sakari Bergen
3fca030603 Fix invalid silence trimmer end-of-input behavior (multiple EndOfInputs)
This caused an export bug when:
a) normalizing
b) adding silence to end
c) having more than one channel

The sound was corrupted by repeating each jack frame as many times
as there were channels.
2013-11-03 21:22:00 +02:00
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
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
5ba369918b add missing file 2013-10-17 15:46:16 -04:00
a2d55d088a add export control with -fvisibility=hidden to audiographer 2013-10-17 15:37:11 -04:00
6daeba047e 'libs/audiographer' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC 2013-09-05 09:21:30 +01:00
e14966e778 'libs/audiographer' - Use 'alloca()' for a stack based array whose size is unknown (required to be buildable with MSVC) 2013-09-05 09:18:30 +01:00
650964f320 Merge branch 'master' into windows 2013-07-17 08:05:59 -04:00
Michael R. Fisher
693713ecdb Allow compiling with c++11 enabled 2013-07-15 22:57:34 -05:00
48f8863b2c Use g_mkstemp in audiographer for portability 2013-07-13 16:44:37 -04:00
f80859f3bd Use uint32_t type instead of uint 2013-07-11 15:16:50 -04:00
ef9ed302e3 Add necessary header include for int64_t type 2013-07-11 13:53:35 -04:00
0e513f0469 Include header that declares ::free for mingw build 2013-07-11 13:53:12 -04:00
5162181767 Fix some usage of non-standard types for portability 2013-07-11 12:05:37 -04:00
Julien de Kozak
16f8fc0657 Fix some compilation warnings 2013-03-23 14:50:58 +01:00
ca697ee768 hide unusued param
git-svn-id: svn://localhost/ardour2/branches/3.0@14053 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-05 21:39:04 +00:00
Sakari Bergen
1550f1ef00 Work around a bug in gdither with 32-bit integer export, fixes 32-bit export.
git-svn-id: svn://localhost/ardour2/branches/3.0@14047 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-03 14:51:08 +00:00
22cb8bfb34 add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13862 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:27:41 +00:00
e2ac31d634 add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13860 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:23:28 +00:00
Sakari Bergen
c8a4bdc4a4 Create export temporary files in the export directory
git-svn-id: svn://localhost/ardour2/branches/3.0@13371 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-30 21:14:03 +00:00
Sakari Bergen
b5c5fc7a08 Fix chunker to handle end of input properly
git-svn-id: svn://localhost/ardour2/branches/3.0@13370 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-30 20:15:11 +00:00
Sakari Bergen
a7cd27e744 Fix end-of-input-handling in silence trimmer
git-svn-id: svn://localhost/ardour2/branches/3.0@13160 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-09-04 18:16:21 +00:00
Sakari Bergen
1573ea991d Add missing #includes to some tests
git-svn-id: svn://localhost/ardour2/branches/3.0@13100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-28 09:08:29 +00:00
3cd8138a41 convert from Glib:: to Glib::Threads for all thread-related API
git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 17:48:55 +00:00
Sakari Bergen
d762be4f73 Fix the ProcessContext copy-ctor stuff for older compilers, which don't support template base class initialization without template parameters
git-svn-id: svn://localhost/ardour2/branches/3.0@12983 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-02 15:48:29 +00:00
Sakari Bergen
5b5998208f Probably fix warnings on Apple's gcc
git-svn-id: svn://localhost/ardour2/branches/3.0@12973 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-01 10:23:44 +00:00
b8d724d57a remove sndfile debugging from export code
git-svn-id: svn://localhost/ardour2/branches/3.0@12805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 22:23:32 +00:00
271c8c8f00 sndfile/export debuggign with ricardus
git-svn-id: svn://localhost/ardour2/branches/3.0@12788 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-19 19:22:03 +00:00
27a1cf2cf7 Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:

CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build


git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:54:10 +00:00
9b99596c6e remove debugging
git-svn-id: svn://localhost/ardour2/branches/3.0@12379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-22 13:05:13 +00:00
451a03d68a more 64bit VM debugging nonsense (svn in the fastest route between my system and the VM :)
git-svn-id: svn://localhost/ardour2/branches/3.0@12368 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-21 20:44:04 +00:00
22ffdf21fe fix --test build on OSX Lion by commenting out code that does not compile
git-svn-id: svn://localhost/ardour2/branches/3.0@12266 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-14 17:43:52 +00:00
Carl Hetherington
7c2b3171c2 Further GCC 4.7.0 fixes.
git-svn-id: svn://localhost/ardour2/branches/3.0@11768 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-30 01:21:08 +00:00
Carl Hetherington
8ae1880e33 Some fixes for GCC 4.7.0
git-svn-id: svn://localhost/ardour2/branches/3.0@11767 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-30 00:03:53 +00:00
Sakari Bergen
f57da9b00e Show proper progress information for export while normalizing
git-svn-id: svn://localhost/ardour2/branches/3.0@11337 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 20:21:54 +00:00
Sakari Bergen
0bede516be Fix export threading timeouts when disk operations take long. Might fix other timeout issues also.
git-svn-id: svn://localhost/ardour2/branches/3.0@11317 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 18:54:13 +00:00
bf8f0b2cb5 Apply patch from timbyr to fix building with --test.
git-svn-id: svn://localhost/ardour2/branches/3.0@10561 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-13 03:54:29 +00:00
9040cbf82a Trim the include tree.
git-svn-id: svn://localhost/ardour2/branches/3.0@10227 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 03:34:02 +00:00
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
a6d7098797 more changes to wscript files to catch up with waf 1.6 and fix OS X issues
git-svn-id: svn://localhost/ardour2/branches/3.0@10176 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 16:22:04 +00:00
1c7cb97d85 Fix installation globs
git-svn-id: svn://localhost/ardour2/branches/3.0@10168 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 23:24:55 +00:00
4ffe8418e3 Use is_defined to check for HAVE_* variables set by checks.
Note that conf.define('FOO', 1) will NOT set conf.env['FOO'].


git-svn-id: svn://localhost/ardour2/branches/3.0@10164 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 20:29:06 +00:00
c1ef7b14a3 Remove use of waf compat15 tool.
Always load waf tools first (prevent smashing of --debug, DATADIR, etc).


git-svn-id: svn://localhost/ardour2/branches/3.0@10163 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 19:58:05 +00:00
723ab60b39 Upgrade to waf 1.6.7 and autowaf r52.
git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 19:17:54 +00:00
4769db412d Fix Python whitespace (follow PEP8 guidelines, reformatted by Python Reindent)
git-svn-id: svn://localhost/ardour2/branches/3.0@9409 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-22 22:15:21 +00:00
9850407bd9 Indent python files with spaces as per style guide.
git-svn-id: svn://localhost/ardour2/branches/3.0@9158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-16 16:32:56 +00:00
Carl Hetherington
73192bc1a7 Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-03 22:26:29 +00:00
520bc1bed4 fix non-inlined SndfileHandle constructor in libaudiographer, which triggers duplicate definition warnings with the OS X linker
git-svn-id: svn://localhost/ardour2/branches/3.0@8017 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 05:13:38 +00:00
Sakari Bergen
fb048ebc30 Fix error in samplerate converter
git-svn-id: svn://localhost/ardour2/branches/3.0@7951 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-02 18:07:29 +00:00
aaf6ea8d28 Upgrade to latest autowaf.
Tidy up configure output.


git-svn-id: svn://localhost/ardour2/branches/3.0@7752 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-07 20:48:54 +00:00
98d994f29c fix a variety of unused argument errors noted by gcc 4.3.2 on x86
git-svn-id: svn://localhost/ardour2/branches/3.0@7733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-02 17:01:36 +00:00
Carl Hetherington
b6642d14ca Write BWF info on export. Fixes #3398.
git-svn-id: svn://localhost/ardour2/branches/3.0@7652 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-19 14:58:54 +00:00
Carl Hetherington
12ce8f17f4 Fix build.
git-svn-id: svn://localhost/ardour2/branches/3.0@6847 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 22:45:30 +00:00
Sakari Bergen
48dd5afaa5 Make audiographer SndfileWriter use PBD::Signal and use it properly. Also make export graph stuff use boost::ptr_list (because of ScopedConnection non-copyability)
git-svn-id: svn://localhost/ardour2/branches/3.0@6844 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 20:49:02 +00:00
Sakari Bergen
830911f6f9 Fix export, which has been broken since the boost::signals2 changes. Also update Audiographer, bacause of its incomplete sndfile handling. Audiographer is equal to revision 74
git-svn-id: svn://localhost/ardour2/branches/3.0@6760 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-15 19:11:48 +00:00
Sakari Bergen
78b6543ba9 Fix AudioGrapher library installation path and enable H/W optimizations in AudioGrapher
git-svn-id: svn://localhost/ardour2/branches/3.0@6418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-31 14:03:30 +00:00
Sakari Bergen
8da27200d1 - Fix process callbakc handling during export
- Fix filename handling when exporting multiple files
- Some updates to audiographer


git-svn-id: svn://localhost/ardour2/branches/3.0@6402 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-27 22:09:40 +00:00
Sakari Bergen
dde0848a98 Re-integrate export-optimization branch.
Export now happens directly to file (unless normalizing is required), and can be easily optimized even further.
The Session process connection is still broken during export (as it was before this commit also).


git-svn-id: svn://localhost/ardour2/branches/3.0@6401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-27 14:46:23 +00:00