13
0
Commit Graph

6430 Commits

Author SHA1 Message Date
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
92ede6153e remove bogus default-channel property from MidiTrack XML
git-svn-id: svn://localhost/ardour2/branches/3.0@9598 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-26 15:03:32 +00:00
16c280e405 turn off relevant fade in/out before creating peakfiles for compound region sources
git-svn-id: svn://localhost/ardour2/branches/3.0@9596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-26 13:56:19 +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
884e147a9c restore compound region fade, where possible, to constituent regions, after uncombine
git-svn-id: svn://localhost/ardour2/branches/3.0@9593 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 22:44:30 +00:00
fa42d70b85 remove --nostrip from noderun script, since it was removed from the build script
git-svn-id: svn://localhost/ardour2/branches/3.0@9592 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 22:13:24 +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
9925ab554e logic to copy audio region fade in/fade out into compound regions (one-way for now)
git-svn-id: svn://localhost/ardour2/branches/3.0@9588 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 18:51:00 +00:00
Carl Hetherington
04b54f8dd1 Fix name of libardour .mo file.
git-svn-id: svn://localhost/ardour2/branches/3.0@9587 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 18:09:19 +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
Carl Hetherington
b38b5fd59b Doxygen tweaks.
git-svn-id: svn://localhost/ardour2/branches/3.0@9581 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 10:15:54 +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
bf57411634 add back combine/uncombine debugging; fix uncombine op to get original region lengths right, i think
git-svn-id: svn://localhost/ardour2/branches/3.0@9579 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 00:20:33 +00:00
Carl Hetherington
edfc4e8563 Fix build.
git-svn-id: svn://localhost/ardour2/branches/3.0@9577 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 22:18:57 +00:00
Carl Hetherington
70b0748fc7 Attempt #46 to understand MIDI data locking.
git-svn-id: svn://localhost/ardour2/branches/3.0@9576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-23 22:16:11 +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
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