d6be900da0
more combine/uncombine fixes including making uncombine push the compound region gain level into the constituents and doing the right thing when we uncombine in a playlist other than the one in which the compound region was created
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-26 17:22:22 +00:00
f38db9a4e3
move session file storage of nested sources from playlist into region, and reload them within Session::XMLRegionFactory, just before we create the region that uses the nested source
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9595 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-26 12:24:04 +00:00
af02cbcafa
Remove unnecessary includes from editor.h.
...
(Don't add includes to headers that aren't necessary! Won't somebody please think of the CPUs?!?)
git-svn-id: svn://localhost/ardour2/branches/3.0@9594 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-26 01:29:59 +00:00
e394642910
revert previous commit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9591 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 21:28:17 +00:00
b45b3460b9
remove dependency on external libgnomecanvas, since we have our own version in the tree
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9590 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 21:18:40 +00:00
e16cba3550
new swedish updates from petter
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9589 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 19:57:05 +00:00
Carl Hetherington
fb39b47861
Zoom session when the mouse pointer is moved up and down during a playhead drag.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 16:38:49 +00:00
Carl Hetherington
711db34a81
Remove MIDI track default channel and its menu, and choose the channel for new notes using MidiTimeAxisView::get_channel_for_add() ( fixes #3998 and #3865 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9585 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 15:19:47 +00:00
e984220eaa
correct the logic used when building a compound region to include a whole-file (whole-source) region as a parent for the region list
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 12:19:24 +00:00
49785b8fbb
updated swedish translation from peppo
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9583 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 11:34:59 +00:00
Carl Hetherington
c07ed4b848
Fix a couple of uninitialised variables (should fix #4059 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9582 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 10:17:16 +00:00
e5dc4e4ea2
change region selection after a combine op
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9580 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 00:40:32 +00:00
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
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
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
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
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
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
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
Carl Hetherington
ad5a326694
Set up _last_cut_copy_source_track on copying automation points. Should help with #3863 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9520 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 15:30:21 +00:00
43798a7c25
sane naming scheme for combined regions; fix deadlock when nesting to more than one level
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9519 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 13:06:55 +00:00
0a9cef7720
very basic Join (regions) editing operation. not finished yet, no undoable, no sensible name for new region, etc. etc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9518 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 02:17:58 +00:00
88a6513e76
use emacs to indent ardour.menus; add Join (regions) item
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9517 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-16 02:16:20 +00:00
1959efd94d
Support compilation with (old) SLV2, or (new) Lilv and (optionally) Suil.
...
Fix ticket #0004041 .
git-svn-id: svn://localhost/ardour2/branches/3.0@9516 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-15 23:10:13 +00:00
4e49c56361
Completely localist use of SLV2 to lv2_plugin.cc and lv2_plugin_ui.cc.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9514 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-14 21:05:26 +00:00
ac367e8904
Make LV2World local to lv2_plugin.cc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9513 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-14 19:55:46 +00:00
