Commit Graph

6408 Commits

Author SHA1 Message Date
Carl Hetherington
b6587ad160 Assorted doxygen fixes; no functional changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@9575 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 22:12:45 +00:00
f7dae62903 OS X compilation fix
git-svn-id: svn://localhost/ardour2/branches/3.0@9574 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 21:09:37 +00:00
371be41d81 uncombine now pays attention to trims + moves done with the compound region, and applies them as necessary to the constituent regions before placing them back in the track
git-svn-id: svn://localhost/ardour2/branches/3.0@9573 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 11:49:46 +00:00
Carl Hetherington
ed2a7c380d Fix bit rot with boost shared_ptr debugging code.
git-svn-id: svn://localhost/ardour2/branches/3.0@9572 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 10:03:29 +00:00
Carl Hetherington
32df620938 Fix a few missing drops of Route references.
git-svn-id: svn://localhost/ardour2/branches/3.0@9571 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 10:03:14 +00:00
Carl Hetherington
09d4ab251e Remove some unused code.
git-svn-id: svn://localhost/ardour2/branches/3.0@9570 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 10:03:04 +00:00
fab94b8495 rationalize and improve region naming conventions to cover compound regions
git-svn-id: svn://localhost/ardour2/branches/3.0@9569 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 21:28:25 +00:00
4df8531289 another translation fix for silly gendered-noun languages :)
git-svn-id: svn://localhost/ardour2/branches/3.0@9568 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 20:47:21 +00:00
2761f899c5 fix translation issue with verb substitution in quit/close dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@9567 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 20:02:50 +00:00
9c733915a0 basic uncombining (no post-facto region trimming)
git-svn-id: svn://localhost/ardour2/branches/3.0@9566 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 16:11:00 +00:00
Carl Hetherington
d40ee95486 Trim some lines from AudioClock by using maps to keep the EventBoxes and Labels in.
git-svn-id: svn://localhost/ardour2/branches/3.0@9565 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 01:18:22 +00:00
Carl Hetherington
f7b41200c6 Separate milliseconds from seconds in the clock widget (#4053).
git-svn-id: svn://localhost/ardour2/branches/3.0@9564 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-22 01:18:05 +00:00
Carl Hetherington
a2d37a02b8 Fix problems with restoration of unused playlists (#4052).
git-svn-id: svn://localhost/ardour2/branches/3.0@9563 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-21 18:44:44 +00:00
2e24dd45c3 Not quite :) Waf obj.defines has no -D (compiler portable...).
git-svn-id: svn://localhost/ardour2/branches/3.0@9562 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-20 16:06:26 +00:00
35df1cfabf catchup tweak for the waf 1.6 changes
git-svn-id: svn://localhost/ardour2/branches/3.0@9561 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-20 14:31:39 +00:00
8d0ba52547 Use ISC license for RDFF (same idea, MIT style, just prettier).
git-svn-id: svn://localhost/ardour2/branches/3.0@9560 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-19 21:57:34 +00:00
c425e61bb9 Fix double MIDI track display on initial load.
git-svn-id: svn://localhost/ardour2/branches/3.0@9559 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-19 21:29:47 +00:00
74fa33486c Fix broken indentation.
git-svn-id: svn://localhost/ardour2/branches/3.0@9558 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-19 21:11:21 +00:00
ecb97a38e0 Make selected region base colour slightly transparent (so you can see the tempo lines while dragging to align things).
git-svn-id: svn://localhost/ardour2/branches/3.0@9557 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-18 07:13:18 +00:00
659f7c5ef3 More consistent style for gain display and peak display.
Gain display is still a little bit smaller though, for mysterious reasons...


git-svn-id: svn://localhost/ardour2/branches/3.0@9556 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-18 07:05:30 +00:00
a54f10d861 Center fader in its (left hand side) mixer strip column.
Attempt to center meter in its as well, but this doesn't seem to be working.
Perhaps this whole section should be layed out as a table to ensure the split
down the middle is aligned no matter what?


git-svn-id: svn://localhost/ardour2/branches/3.0@9555 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-18 06:53:24 +00:00
a5870e4f96 Fix broken meter style on MIDI tracks.
git-svn-id: svn://localhost/ardour2/branches/3.0@9554 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-18 05:47:21 +00:00
297a51b715 Make shuttle colour a configuration option.
Make default shuttle colour match clock text green.

This is a bit odd, since it is a "canvas variable", except not... all the other colours are in this section though.  Maybe they're more appropriately named "colours", but it's too late for that now, or maybe this option belongs elsewhere, but when we need new mechanism for that...


git-svn-id: svn://localhost/ardour2/branches/3.0@9553 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-18 05:32:41 +00:00
7c7afd08b9 Fix indentation.
git-svn-id: svn://localhost/ardour2/branches/3.0@9552 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-18 05:09:07 +00:00
041c882143 Add 'controls' item to plugin insert context menu to always show Ardour generated controls for plugin, even if the plugin has a GUI. In particular, this gives you UI access to presets and the other handy stuff ardour sticks at the top, for inherently broken external UIs which don't allow Ardour to add such things.
Fix crash related to scale points when showing plugin UIs.

Fix packing of scrolled generic plugin UI so the controls expand (rather than leaving a ton of wasted empty space and using unnecessary scroll bars).


git-svn-id: svn://localhost/ardour2/branches/3.0@9551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-18 05:00:44 +00:00
Carl Hetherington
424b3479de No-op: indentation.
git-svn-id: svn://localhost/ardour2/branches/3.0@9550 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 23:23:46 +00:00
Carl Hetherington
84aeb92d15 Re-fix problems when zero-length MIDI regions are created by an import. Set those regions to have the length of one beat, rather than 1 frame, so that the length doesn't get rounded back down to 0 by frames/beats conversions (bug #4000).
git-svn-id: svn://localhost/ardour2/branches/3.0@9549 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 23:07:46 +00:00
ba51f635f7 revert that last commit
git-svn-id: svn://localhost/ardour2/branches/3.0@9548 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 21:44:10 +00:00
39d8aa0e94 put compounded-xfades at the right place, i think
git-svn-id: svn://localhost/ardour2/branches/3.0@9547 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 21:43:29 +00:00
4fade1ea35 xfades in combined regions seem to work
git-svn-id: svn://localhost/ardour2/branches/3.0@9546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 18:23:01 +00:00
be830adccb not actually working attempt to copy relevant xfades into compound regions; fix compilation issues with an earlier commit
git-svn-id: svn://localhost/ardour2/branches/3.0@9544 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 16:45:22 +00:00
Carl Hetherington
71596b002e Fix corruption of follow playhead state on quit (#4048).
git-svn-id: svn://localhost/ardour2/branches/3.0@9542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 15:28:12 +00:00
Ben Loftis
aa6adacc75 fix thinko in playlist constructor for cut and copy
git-svn-id: svn://localhost/ardour2/branches/3.0@9541 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 15:20:18 +00:00
Carl Hetherington
819faa3b0b Remove unnecessary duplicate take of Sequence's read_lock.
git-svn-id: svn://localhost/ardour2/branches/3.0@9537 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 12:01:05 +00:00
Carl Hetherington
c86ccc7db2 Minor tidy-ups.
git-svn-id: svn://localhost/ardour2/branches/3.0@9536 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 12:00:10 +00:00
Carl Hetherington
fb9b778fbc Remove unused mutex.
git-svn-id: svn://localhost/ardour2/branches/3.0@9535 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 11:59:47 +00:00
Carl Hetherington
da6384925e Remove unnecessary virtual declaration.
git-svn-id: svn://localhost/ardour2/branches/3.0@9534 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-17 11:54:45 +00:00
Carl Hetherington
23f2f8f546 Copy local state in AudioRegionView copy constructor. Fixes #4047.
git-svn-id: svn://localhost/ardour2/branches/3.0@9533 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 23:10:58 +00:00
Carl Hetherington
0fa76ceb20 Remove unused constructor.
git-svn-id: svn://localhost/ardour2/branches/3.0@9532 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 23:10:45 +00:00
Carl Hetherington
eeadeac7e4 Fix undo when notes are changed and then removed by the overlap checker (#3995).
git-svn-id: svn://localhost/ardour2/branches/3.0@9531 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 22:23:18 +00:00
Carl Hetherington
a581b356b1 A few capitalisation fixes.
git-svn-id: svn://localhost/ardour2/branches/3.0@9530 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 22:22:57 +00:00
c8a27ebdbf track combine ops per-playlist to avoid name collisions for compound regions
git-svn-id: svn://localhost/ardour2/branches/3.0@9529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 21:21:16 +00:00
99aa8c6338 rename join regions op as combine regions; save and restore nested playlists, sources, regions; add undo/redo for combine; fixup peakfile use/discovery
git-svn-id: svn://localhost/ardour2/branches/3.0@9528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 20:16:57 +00:00
Carl Hetherington
4b848856eb Fix undo of timestretch (#3905).
git-svn-id: svn://localhost/ardour2/branches/3.0@9527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 20:13:03 +00:00
Carl Hetherington
95b83295b2 Minor coding style fix and comment addition.
git-svn-id: svn://localhost/ardour2/branches/3.0@9526 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 20:12:45 +00:00
Carl Hetherington
7fea58a3ad Update to French translation from Roming22-FR (#4046).
git-svn-id: svn://localhost/ardour2/branches/3.0@9525 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 18:58:10 +00:00
Carl Hetherington
7390303728 Make MIDI channel selector button colours more distinct (#3772).
git-svn-id: svn://localhost/ardour2/branches/3.0@9524 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 18:18:13 +00:00
29dd7bbac7 Update wscripts for portability and steps towards waf 1.6 migration.
Use obj.defines and obj.includes instead of c[xx]flags (more compiler portable).
Use lists instead of space delimited strings (more flexible and waf 1.6 compatible).
Fix crazy long lines.


git-svn-id: svn://localhost/ardour2/branches/3.0@9523 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 18:02:38 +00:00
678bb05bd6 Don't check for SLV2 if Lilv is found
git-svn-id: svn://localhost/ardour2/branches/3.0@9522 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 17:12:57 +00:00
4b5bd4ca46 refactor playlist sources to allow for MIDI and upcoming work on save/restore
git-svn-id: svn://localhost/ardour2/branches/3.0@9521 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 15:49:26 +00:00