Commit graph

372 commits

Author SHA1 Message Date
Paul Davis
6c52612009 merge 12954:1363 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13364 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-29 16:50:05 +00:00
Paul Davis
680ea1118c merge 13034:13103 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13107 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-02 14:33:56 +00:00
Paul Davis
6e824e7797 merge 12717:12954 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12955 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 13:30:03 +00:00
Paul Davis
14aac7e210 merge 12717:12791 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 03:53:34 +00:00
Paul Davis
129dcd7f97 merge 12607:12717 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12718 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-14 01:09:40 +00:00
Paul Davis
8e1db53556 merge -r12436:12545 from 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-02 16:21:08 +00:00
Paul Davis
a2bb5c1feb merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 19:01:24 +00:00
Paul Davis
89df06eb2d merge 3.0 12308:12389
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12391 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-23 15:41:07 +00:00
Paul Davis
6312242820 merge 12290:12308 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12309 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 09:06:07 +00:00
Paul Davis
ae7c1d452d merge 12268:12290 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 08:52:43 +00:00
Paul Davis
d6edbf5ca2 merge 12096:12268 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-14 18:35:19 +00:00
Paul Davis
9c8b57aab0 SG: merge 3.0 from 11783-12096
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12097 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-26 17:06:21 +00:00
Paul Davis
85a27910cb more work on getting SG config pane into shape
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@11783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-03 14:34:13 +00:00
Carl Hetherington
47faebb367 Missing file.
git-svn-id: svn://localhost/ardour2/branches/3.0@11779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-02 13:52:36 +00:00
Carl Hetherington
7f417fb44f Remove unused ustring version of url_decode(). Rework
the other version to be a bit simpler, avoiding #4800.


git-svn-id: svn://localhost/ardour2/branches/3.0@11771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-01 14:30:06 +00:00
Carl Hetherington
3240a93aad Fix libpbd tests and add test for url_decode().
git-svn-id: svn://localhost/ardour2/branches/3.0@11770 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-01 14:29:26 +00:00
Carl Hetherington
4c0b104db5 Fix test build.
git-svn-id: svn://localhost/ardour2/branches/3.0@11738 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-21 01:07:05 +00:00
Paul Davis
71b3c8cfe1 some deep changes to xml++ in which we retain a C-level xmlDocPtr as a member of an XMLTree objects. this allows us to do repeated XPATH searches (as in the midnam parser of libmidi++) without constantly rewriting an entire tree into memory to recreate a new xmlDocPtr with which we can search. Since XMLTree objects don't typically stay around for very long, just when serializing to/from disk, this is not anticipated to have much (if any) impact on memory consumption
git-svn-id: svn://localhost/ardour2/branches/3.0@11733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-20 18:01:07 +00:00
Paul Davis
3c7f9586ae implement XMLNode::operator=() as a deep operation with the same semantics as the XMLNode copy constructor. attempt to share as much code as possible between them and the destructor
git-svn-id: svn://localhost/ardour2/branches/3.0@11612 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-07 02:07:35 +00:00
Paul Davis
f72ecaf54a use #include <typeinfo> before using typeid
git-svn-id: svn://localhost/ardour2/branches/3.0@11576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-01 20:25:31 +00:00
Carl Hetherington
4381b590bb Reinstate user Controllable values, as they are needed
for gain (which I forgot about).


git-svn-id: svn://localhost/ardour2/branches/3.0@11293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 16:38:56 +00:00
Carl Hetherington
d03d0363a4 Remove unused concept of user' values. Make user_to_ui
and ui_to_user virtual members of PBD::Controllable.


git-svn-id: svn://localhost/ardour2/branches/3.0@11286 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 18:02:36 +00:00
Paul Davis
567153e4fb new file, a small idea
git-svn-id: svn://localhost/ardour2/branches/3.0@11257 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 01:34:53 +00:00
Paul Davis
d51f3e34b4 complete the do-not-free-data-from-getmntinfo() fix
git-svn-id: svn://localhost/ardour2/branches/3.0@11232 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-11 18:14:18 +00:00
Paul Davis
e7bb933477 fix nasty memory-related crashes caused by not noticing a bug in getmntinfo() on OS X, which disallows free()-ing memory allocated by that function
git-svn-id: svn://localhost/ardour2/branches/3.0@11211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 22:02:10 +00:00
Carl Hetherington
9b975dce38 Fix typo.
git-svn-id: svn://localhost/ardour2/branches/3.0@11202 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 01:59:52 +00:00
Paul Davis
0ddff57b50 sort debug options
git-svn-id: svn://localhost/ardour2/branches/3.0@11194 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-08 16:38:49 +00:00
Paul Davis
c3a52084f8 new DEBUG_ENABLED(bits) macro, potentially useful here and there
git-svn-id: svn://localhost/ardour2/branches/3.0@11102 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-28 21:01:52 +00:00
Paul Davis
a556546291 explain MXCSR shenanigans in libs/pbd/fpu.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@11079 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 22:32:21 +00:00
Carl Hetherington
39f765614a Clear up confusion with overloads of _frozen and frozen()
meaning different things.


git-svn-id: svn://localhost/ardour2/branches/3.0@11016 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-17 16:37:18 +00:00
Carl Hetherington
084cd5ffda Add basic test of playlist layering.
git-svn-id: svn://localhost/ardour2/branches/3.0@11011 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-15 14:33:20 +00:00
Carl Hetherington
73a91402cd Save templates as directories with plugin state, if
there is any, and copy that state to sessions created
from those templates.  Should fix #4525.  Breaks
existing session templates, sorry; they can be fixed by
moving the .template file into a new directory with the
name of the template (minus the .template).


git-svn-id: svn://localhost/ardour2/branches/3.0@10982 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 20:38:42 +00:00
Paul Davis
639bb7dc5d use compiler-generated _LP64 macro to detect x86_64 rather than USE_X86_64_ASM
git-svn-id: svn://localhost/ardour2/branches/3.0@10871 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:38:31 +00:00
Carl Hetherington
01acbbea80 Speculative fix for crash with untranslated messages
without | in them (#4521).


git-svn-id: svn://localhost/ardour2/branches/3.0@10838 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-29 21:43:40 +00:00
Paul Davis
091b9ff7b9 tweak wscript files to set PACKAGE in one place
git-svn-id: svn://localhost/ardour2/branches/3.0@10747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 22:24:56 +00:00
Carl Hetherington
5c73926324 Simple ambiguitity-resolution wrapper for gettext; use for
Manual (#4496).


git-svn-id: svn://localhost/ardour2/branches/3.0@10720 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 00:04:44 +00:00
Carl Hetherington
0c9c47086c Slightly unpleasant fix for creation of tracks from
templates; it would be nice if we could set things up using
the Route's logic for setting names of its children, rather
than repeating the same logic in XML-land (#4303).


git-svn-id: svn://localhost/ardour2/branches/3.0@10655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-16 23:03:59 +00:00
Paul Davis
535f52c1b5 remove stupid symlink stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@10635 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-16 00:13:42 +00:00
Paul Davis
a8615b40a1 utility function to detect symlinks
git-svn-id: svn://localhost/ardour2/branches/3.0@10605 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 01:25:18 +00:00
Paul Davis
4bd00b89c7 utility function to detect symlinks
git-svn-id: svn://localhost/ardour2/branches/3.0@10604 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 01:25:03 +00:00
David Robillard
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
Carl Hetherington
4c2f9dd11b Add function to recover a full path from something like '.'
git-svn-id: svn://localhost/ardour2/branches/3.0@10284 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-22 21:46:46 +00:00
Paul Davis
4085309cdb make Stateful::_id private and provide appropriate methods to set it, and use them throughout ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@10222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 13:18:47 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
d09ebfb03b make libpbd header checks non-mandatory (for OS X)
git-svn-id: svn://localhost/ardour2/branches/3.0@10171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 12:11:20 +00:00
David Robillard
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
David Robillard
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
David Robillard
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
Carl Hetherington
fa590d385b Add Signal5.
git-svn-id: svn://localhost/ardour2/branches/3.0@10134 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-26 22:22:14 +00:00