13
0
Commit Graph

3184 Commits

Author SHA1 Message Date
7181a20dc6 don't double-load NestedSource nodes, which are listed both forthe parent/root region and all children; even better, don't list them twice anyway - just for the whole file parent/root region
git-svn-id: svn://localhost/ardour2/branches/3.0@9761 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-22 22:46:31 +00:00
ae3c7234e7 remove some debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@9760 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-22 20:06:31 +00:00
9687e8a667 second half of "bomb out if playlist construction from XML fails"
git-svn-id: svn://localhost/ardour2/branches/3.0@9759 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-22 20:06:10 +00:00
2801e91fe2 drobilla-spacification of playlist.cc, along with correctly bombing out if ::set_state() fails, part 1
git-svn-id: svn://localhost/ardour2/branches/3.0@9758 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-22 20:00:30 +00:00
8aa0b2966e ignore unpaired noteoff's when writing part of a MidiModel to a new source. in reality, there should be no unpaired noteoffs, but this is still an important fix
git-svn-id: svn://localhost/ardour2/branches/3.0@9757 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-22 19:59:46 +00:00
260c1c1a13 remove some potential HCI confusion for Gtkmm2ext::UI::popup_error() by using a standard MessageDialog (as noticed by thorwil)
git-svn-id: svn://localhost/ardour2/branches/3.0@9756 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-22 14:38:32 +00:00
be614d0538 change default overlapping note strategy to "relax" (i.e. do nothing); fix crash when looping with MIDI data; add back note-off resolution at loop point (if it was actually there) so that notes are turned off (but don't forget Ye Olde Sustain Pedal/Controller) when looping; minor other non-functional tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@9753 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-21 21:29:22 +00:00
500aaa0dee an entire freakin' day working on 1 working function, VolumeController::adjust() ... probably not done, but better ... gain control that occurs via this function occurs in discrete, fixed dB steps
git-svn-id: svn://localhost/ardour2/branches/3.0@9752 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-21 01:36:20 +00:00
12c844dd8d remove some debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@9749 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-19 23:04:55 +00:00
d5e09076ca much ado about nothing when it comes to gain control
git-svn-id: svn://localhost/ardour2/branches/3.0@9748 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-19 23:02:55 +00:00
182b23e744 cleanup confused mess related to jack_port_type_get_buffer_size()
git-svn-id: svn://localhost/ardour2/branches/3.0@9747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-19 21:47:21 +00:00
01e006e46e some changes to try to make the monitor section gain controls work as intended, and along the way start to rationalize MotionFeedback/VolumeController classes
git-svn-id: svn://localhost/ardour2/branches/3.0@9746 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-17 21:47:20 +00:00
1961051416 monitor send gets access to the (shared) pannable of the track/bus, thus ensuring that the monitor feed is panned. required a few fixes along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9731 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-14 19:00:08 +00:00
a5674e9271 fix initialization of gain for Listen internal sends (to monitor bus); remove pannable object from monitor bus after (re)creation from XML
git-svn-id: svn://localhost/ardour2/branches/3.0@9730 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-14 14:49:06 +00:00
22a4f44939 a real, working fix for panning regression in alpha6
git-svn-id: svn://localhost/ardour2/branches/3.0@9725 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-13 21:53:57 +00:00
37e9a53180 remove Pannable/PanShell from the Monitor bus
git-svn-id: svn://localhost/ardour2/branches/3.0@9720 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-13 15:52:31 +00:00
961e25d90e reload alpha1-6 Pannable XML state so that panning of existing sessions should work again
git-svn-id: svn://localhost/ardour2/branches/3.0@9719 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-13 15:50:05 +00:00
5afe60f0e3 fix restore of Pannable state from XML (regression in alpha6)
git-svn-id: svn://localhost/ardour2/branches/3.0@9717 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-12 22:17:29 +00:00
5b3106ee31 build script fix
git-svn-id: svn://localhost/ardour2/branches/3.0@9715 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-12 22:08:33 +00:00
786a61a275 update i18n build system and *.po files for translators
git-svn-id: svn://localhost/ardour2/branches/3.0@9714 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-12 22:05:55 +00:00
Sakari Bergen
1de3eac2de Fix #4094: show total export progress instead of per timespan progress
git-svn-id: svn://localhost/ardour2/branches/3.0@9710 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 21:12:24 +00:00
3168d5e22e new es_ES translation from Pablo Fernández
git-svn-id: svn://localhost/ardour2/branches/3.0@9707 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 17:17:01 +00:00
1060243302 major, substantive reworking of how we store GUI information (visibility, height) for automation data. old design stored (insufficient) identifying information plus actual data in a GUI-only XML node; new scheme adds GUI data via extra_xml node to each AutomationControl object. reworked public/private methods for showing/hiding TimeAxisView objects; changed labelling of automation tracks to just show the name of the controlled parameter - more info can be viewed in the tooltip for the track headers. NOTE: Session file format ALTERED. No data loss but track visibility may be different than previous ardour3 versions
git-svn-id: svn://localhost/ardour2/branches/3.0@9703 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 15:35:34 +00:00
Sakari Bergen
7468fdb9ca Typedef all globally used export smart pointer types in one file.
Some of them need to be ordered in STL containers, and thus need
a special comparable wrapper for boost::shared_ptr, defined in
comparable_shared_ptr.h. This also alleviates the typedef hell
present earlier in some export classes :)

Making the timespan pointer comparable should fix bug #4093


git-svn-id: svn://localhost/ardour2/branches/3.0@9702 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 14:14:24 +00:00
071cc3ef01 fix serious breakage with setup of plugin automatable controls/parameters, in which the relative ordering of things during ::set_state() was totally wrong. still see multiple instances of automation tracks for processors in GUI
git-svn-id: svn://localhost/ardour2/branches/3.0@9698 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-09 20:21:46 +00:00
1a2a58fdd6 don't call Processor::set_state() from PluginInsert::set_state() till the plugins are present in the container, so that describe_parameter() can work
git-svn-id: svn://localhost/ardour2/branches/3.0@9696 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-09 13:55:52 +00:00
b6b24d353b more clock & time info box tweaking
git-svn-id: svn://localhost/ardour2/branches/3.0@9689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-08 17:27:26 +00:00
a56555e8b2 remove "Off" as a clock mode, make it a state instead; track editor mouse mode when displaying selection (not 100% coverage of different selections yet); add extra negative field for timecode clock to help with text alignment; add clock mode = timecode option to menus
git-svn-id: svn://localhost/ardour2/branches/3.0@9685 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-07 23:07:08 +00:00
be1abb12ff more clock tweaking
git-svn-id: svn://localhost/ardour2/branches/3.0@9680 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-07 16:42:48 +00:00
0a53bb1d42 lots of clock tweaks, but still, STILL! not done, really
git-svn-id: svn://localhost/ardour2/branches/3.0@9678 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-07 15:23:06 +00:00
e77b5261d2 next iteration of clock work. still far from complete, and probably waiting on a rethink of text rendering+layout. but it has the info block now, and it semi-works
git-svn-id: svn://localhost/ardour2/branches/3.0@9676 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-03 22:18:47 +00:00
11bcfd8429 add extended info fields to clocks; clock tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@9675 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 21:43:10 +00:00
811acc5e6e Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@9674 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 17:58:02 +00:00
83f385d263 audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 17:50:37 +00:00
add91aa2d7 random header include removal
git-svn-id: svn://localhost/ardour2/branches/3.0@9672 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 17:49:39 +00:00
a66860c339 API and implementation changes to CairoCell and friends before the audio clock commit
git-svn-id: svn://localhost/ardour2/branches/3.0@9670 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 17:47:11 +00:00
3f68aa2638 Make button 1 the default for inserting notes via modifier shortcut with select tool
git-svn-id: svn://localhost/ardour2/branches/3.0@9667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 03:17:35 +00:00
98c7200f16 Fix broken whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9666 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 01:01:07 +00:00
f48c69e2b2 Missed one :)
git-svn-id: svn://localhost/ardour2/branches/3.0@9661 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 20:36:16 +00:00
a473d630eb Fix broken whitespace. I'd apologize for the compile times if it was my fault :D
git-svn-id: svn://localhost/ardour2/branches/3.0@9654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 16:50:12 +00:00
a46cea06e2 new CairoCell and related classes designed for drawing audio clocks more efficiently etc. etc.
git-svn-id: svn://localhost/ardour2/branches/3.0@9651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 11:51:32 +00:00
fd33fa896f Quantize notes to session tempo time, not relative to start of region (fix issue #4069).
git-svn-id: svn://localhost/ardour2/branches/3.0@9640 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-31 02:59:48 +00:00
a0d09e81d4 update .po files for translators
git-svn-id: svn://localhost/ardour2/branches/3.0@9639 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-31 02:29:00 +00:00
a206c5c4a9 Fix wordo (fix ticket #4080)
git-svn-id: svn://localhost/ardour2/branches/3.0@9637 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-31 00:19:29 +00:00
de9e216cb5 (1) push a locate all the way through the processing heirarchy so that MIDI output ports can resolve any notes currently playing (2) remove MidiStateTracker from MidiPort and use a fixed set of MIDI messages (sustain-off and all-notes-off, per channel) to do note resolution (3) move note resolution caused by a LoopEvent psuedo-event to within the main MidiPort::flush_output() loop, so that we resolve (turn off) Notes that come before the loop point, rather than send them out after the note resolution messages
git-svn-id: svn://localhost/ardour2/branches/3.0@9635 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-30 21:37:58 +00:00
14a80c091d reverse the use of copy_dependents() when uncombining a region, so that the right xfade shows up
git-svn-id: svn://localhost/ardour2/branches/3.0@9633 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-30 13:55:06 +00:00
d4d5b30aeb remove unused and useless "src" argument for a number of Region property modifying methods
git-svn-id: svn://localhost/ardour2/branches/3.0@9632 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-30 13:54:44 +00:00
6eba90adb3 add dependents to a compound playlist before creating a source from it, so that the source's new peakfile shows the xfades
git-svn-id: svn://localhost/ardour2/branches/3.0@9631 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-30 13:23:19 +00:00
c937a67f6e do not offer combine operation for MIDI (see comment in libs/ardour/midi_playlist_source.cc for an explanation)
git-svn-id: svn://localhost/ardour2/branches/3.0@9630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-30 11:57:12 +00:00
0a9f5423f5 detect buffer "overflow" when delivering immediate events and queue remainder for delivery next time (though without actually requeing - just leave ringbuffer ptrs/indexes where they are. required some deep but minor changes in how MidiRingBuffer::read() works, so that we can detect if we're going to be able to deliver an event before we actually read any of its data. Peek FTW!
git-svn-id: svn://localhost/ardour2/branches/3.0@9629 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-29 17:35:21 +00:00
36ccf83049 clarify some confusion about how "raw" port buffer sizes are defined
git-svn-id: svn://localhost/ardour2/branches/3.0@9628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-29 17:33:41 +00:00
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