489d2ba1a7
don't always rebuild peakfiles for compound regions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9627 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-29 14:38:25 +00:00
c3821a7816
totally untested initial code for MidiPlaylistSource, to provide for compound MIDI regions. putting it into SVN because my system might crash overnight :)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9626 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-29 01:54:19 +00:00
8855b1643c
more gcc 4.6/standards compliance
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9625 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-29 00:25:30 +00:00
df46ab2c02
attempt to be compliant with gcc 4.6 (assuming that its more compliant with standards), by defining a default constructor for an object that is in static/global scope
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-28 23:45:34 +00:00
788dfc6a51
clean up memory leaks with nested source read buffers
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9621 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-28 02:30:25 +00:00
43495d7f2b
putative fix for crashes related to diskstream playback buffer refills with compound regions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9620 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-28 00:59:53 +00:00
06da4278db
abort when cnt is too high
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9619 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-27 23:51:32 +00:00
a699df37ad
debugging output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9618 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-27 23:44:13 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
