13
0
Commit Graph

3278 Commits

Author SHA1 Message Date
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
2b7f092b85 Generic scale points API.
Hide scale points implementation inside specific Plugin subclass.
Don't needlessley/slowly get scale points twice for each port while building UI.
Remove dependence on specific plugin types from GenericPluginUI.


git-svn-id: svn://localhost/ardour2/branches/3.0@9511 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-14 18:43:34 +00:00
c78528dcea Use LV2_SUPPORT define instead of HAVE_SLV2.
git-svn-id: svn://localhost/ardour2/branches/3.0@9510 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-14 17:59:16 +00:00
8fc47ac2ae make sure Edit property of RouteGroup is enabled when doing a few different playlist and other ops and applying them to the group
git-svn-id: svn://localhost/ardour2/branches/3.0@9509 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-13 20:57:13 +00:00
c3c8530ffc initial volley of work for AudioPlaylistSource, the basic prototype for sources-that-are-nested
git-svn-id: svn://localhost/ardour2/branches/3.0@9508 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-13 19:55:52 +00:00
Carl Hetherington
d0bb7df866 Return shuttle speed to previous value on release after sprung grab (#4039).
git-svn-id: svn://localhost/ardour2/branches/3.0@9506 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-13 17:25:02 +00:00
Carl Hetherington
ac23288b5d Fix update of session range location on copy-dragging regions (#4038).
git-svn-id: svn://localhost/ardour2/branches/3.0@9504 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-12 21:29:27 +00:00
Carl Hetherington
5392447686 Cope with tracks having order keys higher than the number of tracks; although I'm not quite sure how this happens. Fixes #4037.
git-svn-id: svn://localhost/ardour2/branches/3.0@9492 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-11 14:15:32 +00:00
Carl Hetherington
29ee63707f Fix crash when clicking on a hit (may be #4036).
git-svn-id: svn://localhost/ardour2/branches/3.0@9491 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-11 11:55:36 +00:00
Carl Hetherington
e89d8af65b Fix non-appearance of MIDI region names (#3891).
git-svn-id: svn://localhost/ardour2/branches/3.0@9483 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-05 14:40:53 +00:00
Carl Hetherington
bcaf808f7d Make GhostRegion a sigc::trackable as MidiGhostRegion connects to signals. Fixes e.g. a crash on track resize after splitting a MIDI region with automation.
git-svn-id: svn://localhost/ardour2/branches/3.0@9482 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-05 13:49:35 +00:00
Carl Hetherington
e0926ce2c6 Fix marker deletion from 9479 properly.
git-svn-id: svn://localhost/ardour2/branches/3.0@9481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-05 12:45:24 +00:00
Carl Hetherington
35eecc5916 Remove LocationMarker from the editor's lists before deleting it, as the deletion causes the contents of the editor's list to be deselected. May be related to #3929.
git-svn-id: svn://localhost/ardour2/branches/3.0@9479 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-05 12:08:12 +00:00
Carl Hetherington
0ae6682bf8 Fix display of new tracks.
git-svn-id: svn://localhost/ardour2/branches/3.0@9478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 15:52:15 +00:00
Carl Hetherington
69e8f4221c Disallow Marker copy construction.
git-svn-id: svn://localhost/ardour2/branches/3.0@9477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 15:51:30 +00:00
Carl Hetherington
d947f27faf Remove some unused code.
git-svn-id: svn://localhost/ardour2/branches/3.0@9476 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 15:03:35 +00:00
Carl Hetherington
4216d201fb Fix offset of verbose cursor when dragging fade-ins (#4010).
git-svn-id: svn://localhost/ardour2/branches/3.0@9473 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 14:56:24 +00:00
Carl Hetherington
378ea3430f Don't alter horizontal padding when shrinking tracks to their minimum height (part of #4014).
git-svn-id: svn://localhost/ardour2/branches/3.0@9472 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 12:26:32 +00:00
Carl Hetherington
bcb554a190 Fix problems with sessions being saved as foo.ardour.ardour when loaded using the session file name (#4026).
git-svn-id: svn://localhost/ardour2/branches/3.0@9471 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 11:32:35 +00:00
Carl Hetherington
f2160077c7 Fix non-appearing track names when opening sessions with minimum track height (part of #4014).
git-svn-id: svn://localhost/ardour2/branches/3.0@9465 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-03 18:40:23 +00:00