13
0
Commit Graph

2902 Commits

Author SHA1 Message Date
c841bb76dd unify ard* scripts for both scons & waf builds
git-svn-id: svn://localhost/ardour2/branches/3.0@4688 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 22:30:13 +00:00
e36424f008 Update waf with a slightly hacked version to print correct paths in compiler error/warning messages.
See http://code.google.com/p/waf/issues/detail?id=367.


git-svn-id: svn://localhost/ardour2/branches/3.0@4687 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 20:55:02 +00:00
6423f13fdf Fix bad initialization.
git-svn-id: svn://localhost/ardour2/branches/3.0@4686 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 20:53:07 +00:00
3eeea347f2 Correctly pass compiler flags as individual list elements so waf can merge them or do whatever clever things it needs to do.
git-svn-id: svn://localhost/ardour2/branches/3.0@4685 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 20:49:21 +00:00
4485edffae Another attempt at FLAC workaround.
git-svn-id: svn://localhost/ardour2/branches/3.0@4684 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 18:59:15 +00:00
9e3b571189 Attempt to strip stupid FLAC include.
git-svn-id: svn://localhost/ardour2/branches/3.0@4683 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 18:37:41 +00:00
db68fcfca6 \n\n
git-svn-id: svn://localhost/ardour2/branches/3.0@4682 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 17:44:47 +00:00
aaa55870bb Don't lie about syslibs until it actually works...
git-svn-id: svn://localhost/ardour2/branches/3.0@4681 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 17:42:54 +00:00
2d8df9e215 Waf: Build LV2 support.
git-svn-id: svn://localhost/ardour2/branches/3.0@4680 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 17:31:00 +00:00
911519a269 Stub (non-functional) options and configuration summary.
git-svn-id: svn://localhost/ardour2/branches/3.0@4679 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 17:16:22 +00:00
d37db18fd1 Fiddle with CCFLAGS and CXXFLAGS.
git-svn-id: svn://localhost/ardour2/branches/3.0@4678 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 16:16:28 +00:00
acf0f59c0e Use stdin/stdout for menu file generation so waf picks up on the dependency.
Fix menu file generation on OSX.


git-svn-id: svn://localhost/ardour2/branches/3.0@4677 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 04:54:08 +00:00
0dac6b545b Waf: build UI/RC files, menu files, keybinding files, and fix paths in wrapper scripts.
Ardour should now build and run when built with waf from a clean svn checkout.


git-svn-id: svn://localhost/ardour2/branches/3.0@4676 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 04:41:09 +00:00
802fac5ea2 Don't link against VAmp plugins.
git-svn-id: svn://localhost/ardour2/branches/3.0@4675 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 03:35:15 +00:00
906567d867 Use actually normal taglib headers (apparently it completely changes them on install. More idiotically layed out library tree, ever.).
Add symlinks to taglib source tree to mimick installed tree to avoid the copy thing.


git-svn-id: svn://localhost/ardour2/branches/3.0@4674 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 03:24:05 +00:00
b80aa1fa9d Use normal taglib include paths.
git-svn-id: svn://localhost/ardour2/branches/3.0@4673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 02:48:07 +00:00
b4d8dd9613 Use quotes for taglib includes.
git-svn-id: svn://localhost/ardour2/branches/3.0@4672 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 02:41:50 +00:00
76f242cb80 Version file building stuff.
Ardour should now compile from a fresh svn checkout using only waf.


git-svn-id: svn://localhost/ardour2/branches/3.0@4671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 02:24:16 +00:00
593ffe8033 Build VAmp plugins.
git-svn-id: svn://localhost/ardour2/branches/3.0@4670 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 01:34:03 +00:00
1d516ac95a Waf building of rubberband.
Use rubberband over soundtouch with waf for the time being.


git-svn-id: svn://localhost/ardour2/branches/3.0@4669 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 01:22:20 +00:00
03536cd399 Fix a bunch of warnings.
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4668 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 00:58:35 +00:00
3bc71af0ca Clean up checks.
git-svn-id: svn://localhost/ardour2/branches/3.0@4667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 00:05:51 +00:00
49412d3852 Remove useless checks.
git-svn-id: svn://localhost/ardour2/branches/3.0@4666 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 00:01:29 +00:00
b7753d292b Add missing gtk2_ardour wscript.
Check for libraries in libardour wscript (instead of gtk2_ardour) where appropriate.


git-svn-id: svn://localhost/ardour2/branches/3.0@4665 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 23:59:55 +00:00
6d8a42cc8e Wrapper scripts for waf built version.
git-svn-id: svn://localhost/ardour2/branches/3.0@4664 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 23:51:37 +00:00
e2353c67fa Add missing gtkmm2ext wscript.
git-svn-id: svn://localhost/ardour2/branches/3.0@4663 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 23:48:10 +00:00
0c0e689d3c Waf building of gtk2_ardour.
git-svn-id: svn://localhost/ardour2/branches/3.0@4662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 23:21:49 +00:00
310d68b953 Waf building of libardour (yay!).
git-svn-id: svn://localhost/ardour2/branches/3.0@4661 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 21:48:32 +00:00
5fe3401814 Waf building of taglib and vamp-sdk.
git-svn-id: svn://localhost/ardour2/branches/3.0@4660 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 19:36:16 +00:00
5b9433f42f Fix stupid warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@4659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 19:35:32 +00:00
8ad0123812 Make unit tests optional.
git-svn-id: svn://localhost/ardour2/branches/3.0@4658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 19:08:26 +00:00
b8b6042e35 Add top level wscript.
git-svn-id: svn://localhost/ardour2/branches/3.0@4657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 18:59:45 +00:00
24f5ad743e Quote includes for control_protocol.
git-svn-id: svn://localhost/ardour2/branches/3.0@4656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 18:39:39 +00:00
e0aaed6d65 *** NEW CODING POLICY ***
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 18:26:51 +00:00
16d9776646 Move waf up to top level, waf building of pbd, evoral, midi++
git-svn-id: svn://localhost/ardour2/branches/3.0@4654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 17:51:42 +00:00
caf103c0af Fix warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@4653 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 17:39:19 +00:00
77a71ac3e0 Fix empty for loop warning in RingBuffer constructor... and scary indentation... this is what was intended here, yes?
git-svn-id: svn://localhost/ardour2/branches/3.0@4652 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 17:23:15 +00:00
09f87d4f9f Upgrade to waf 1.5.3.
git-svn-id: svn://localhost/ardour2/branches/3.0@4651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 16:41:27 +00:00
c9e5903e73 Clean up xml++.h and xml++.cc in Ardour style.
No functional changes.
(We've diverged far enough for it to not matter, and are about to diverge even more, so might as well).


git-svn-id: svn://localhost/ardour2/branches/3.0@4649 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-22 20:52:34 +00:00
5b04ddf424 Make commands noncopyable (they are definitely not copy safe).
memento_command.h style.


git-svn-id: svn://localhost/ardour2/branches/3.0@4648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-22 17:37:33 +00:00
df4e6f2341 Fix recording of the last disk chunk's worth of MIDI data.
git-svn-id: svn://localhost/ardour2/branches/3.0@4645 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-20 01:20:03 +00:00
c9582da233 Make source length a dynamic thing.
Update MIDI region length (actually and visually) when position changes.


git-svn-id: svn://localhost/ardour2/branches/3.0@4644 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-20 00:30:42 +00:00
bed0d89337 Clean up Region interface, remove Readable stub kludge.
git-svn-id: svn://localhost/ardour2/branches/3.0@4643 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 21:06:56 +00:00
75c15679bf Only create a Curve for an AutomationList if we need it.
Fix crash on crossfade editor show (ticket 2442).


git-svn-id: svn://localhost/ardour2/branches/3.0@4641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 19:42:25 +00:00
c006ff1762 Fix crash when using pencil on empty track areas while zoomer is fully zoomed out (and probably pretty much everything else when track is fully zoomed out...).
git-svn-id: svn://localhost/ardour2/branches/3.0@4640 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 18:10:50 +00:00
167150d961 Check for alsa correctly. Hopefully.
git-svn-id: svn://localhost/ardour2/branches/3.0@4639 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 17:57:34 +00:00
8a28ea6154 Introduce new time for session-relative frame time, and make source interface capable of handling 64-bit long sessions.
sframes_t is "session frames".  The rules for time stamps are:
 - Anything relative to transport time, session position, etc, should be sframes_t
 - Anything relative to jack cycles, including the length thereof, should be nframes_t

To support sessions which exceed UINT32_MAX frames, we need to replace all the uses of
nframes_t for session time with sframes_t, and make sure the conversions are sound.
This does not depend on jack's nframes_t; that we are using the same type at all right now was an oops.

This is also be kinda nice for readability since the two different time bases have different types...


git-svn-id: svn://localhost/ardour2/branches/3.0@4636 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 05:45:11 +00:00
0f71728a92 Interpret tempo time based on read position (not source timeline position which is more or less meaningless).
Move time conversion into the region view rather than the source.
Adapt MIDI (including controllers) regions to the destination tempo when moved (e.g. dragging a region to a location with half the tempo will make the notes twice as long).


git-svn-id: svn://localhost/ardour2/branches/3.0@4635 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 04:12:54 +00:00
8f572c3d3f Readable is not as generic as its name implies ;)
git-svn-id: svn://localhost/ardour2/branches/3.0@4634 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 01:56:58 +00:00
067faeca62 Remove unused Session::curves.
git-svn-id: svn://localhost/ardour2/branches/3.0@4633 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 01:24:34 +00:00