13
0
Commit Graph

3671 Commits

Author SHA1 Message Date
Carl Hetherington
2898c4fa70 Make the behaviour zoom to region more intuitive (IMHO); ie always zoom to the selected region. Not quite sure what the zoomed_to_region flag was intended to achieve. Fixes mantis 2154.
git-svn-id: svn://localhost/ardour2/branches/3.0@5823 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 18:20:38 +00:00
b488867f32 handle searching for a note in an empty note list
git-svn-id: svn://localhost/ardour2/branches/3.0@5822 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 12:16:30 +00:00
0def2d2d82 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@5821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 02:26:25 +00:00
958fe26790 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@5820 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 02:17:28 +00:00
ed3b46e03b Factor out more duplicated code.
git-svn-id: svn://localhost/ardour2/branches/3.0@5819 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 02:14:53 +00:00
22fd9aec55 Factor out duplicated code in AudioDiskstream and MidiDiskstream.
git-svn-id: svn://localhost/ardour2/branches/3.0@5818 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 02:01:26 +00:00
55ba5c60b3 Implement out-of-place MidiBuffer::merge.
Completely untested.


git-svn-id: svn://localhost/ardour2/branches/3.0@5817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 01:50:15 +00:00
09990dd26d Use a template to merge PortSet::iterator and PortSet::const_iterator duplicated code.
git-svn-id: svn://localhost/ardour2/branches/3.0@5816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 01:32:34 +00:00
ac8b165644 Const-correct BufferSet.
git-svn-id: svn://localhost/ardour2/branches/3.0@5815 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 01:24:31 +00:00
61c508f3c0 Only build unit tests if configure --test is passed.
git-svn-id: svn://localhost/ardour2/branches/3.0@5814 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 01:07:15 +00:00
Carl Hetherington
9155aca8c2 Tidy up the popup region editor and fix a few bugs with it; should close mantis 2601 and 2602.
git-svn-id: svn://localhost/ardour2/branches/3.0@5813 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 01:05:33 +00:00
089d75e8a8 Whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@5812 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 00:50:43 +00:00
Carl Hetherington
6c2dd7e996 Fix 2074: setting the NSD to not connect outputs to anything is ignored.
git-svn-id: svn://localhost/ardour2/branches/3.0@5811 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 20:30:09 +00:00
Carl Hetherington
0e601ee51a Always call set_width_enum after set_route on mixer strips, to ensure that width is correctly set to editor_mixer_strip_width (as set_route will probably call set_width_enum itself)
git-svn-id: svn://localhost/ardour2/branches/3.0@5810 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 19:20:48 +00:00
Carl Hetherington
da9cb135f1 Remove debug code from last commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@5809 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 18:16:57 +00:00
Carl Hetherington
41b8a010da Stop ardour exiting in the case where you have a loaded session, then select New Session, cancel.
git-svn-id: svn://localhost/ardour2/branches/3.0@5808 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 18:12:20 +00:00
Carl Hetherington
917f02e5f6 Fix button labelling for >1 input / output routes.
git-svn-id: svn://localhost/ardour2/branches/3.0@5807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 17:45:51 +00:00
Carl Hetherington
918fb68a03 Fix memory leak.
git-svn-id: svn://localhost/ardour2/branches/3.0@5806 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 17:44:20 +00:00
Carl Hetherington
09ec342926 Tidy up window titles, according to GNOME HIG and as suggested in mantis 2803.
git-svn-id: svn://localhost/ardour2/branches/3.0@5805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 17:25:37 +00:00
539a692b0e track notes at the region level in MidiPlaylist; resolve them (deliver note offs) if a note spans the end of the region
git-svn-id: svn://localhost/ardour2/branches/3.0@5804 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 17:05:22 +00:00
a86b994c68 Logarithmic note seek for Sequence iterator.
git-svn-id: svn://localhost/ardour2/branches/3.0@5803 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 16:23:08 +00:00
70ad8b059a Better test for iterator seek.
git-svn-id: svn://localhost/ardour2/branches/3.0@5802 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 16:14:55 +00:00
0a9b982620 Add unit test for Sequence iterator seeking.
git-svn-id: svn://localhost/ardour2/branches/3.0@5801 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 16:09:20 +00:00
5c1dccaca5 Use logarithmic search for MidiModel::find_note (used by DiffCommand).
git-svn-id: svn://localhost/ardour2/branches/3.0@5800 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 15:44:58 +00:00
a2c434d5cd Fix insane formatting/whitespace in evoral test stuff. C'mon Hans ;)
git-svn-id: svn://localhost/ardour2/branches/3.0@5799 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 15:26:56 +00:00
cb8407d26f Use set over vector for Sequence::Notes, for logarithmic search by time.
git-svn-id: svn://localhost/ardour2/branches/3.0@5798 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 15:23:42 +00:00
Carl Hetherington
7b94110c54 Add mono switch to mixer strips (mantis 1068)
git-svn-id: svn://localhost/ardour2/branches/3.0@5797 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 14:46:15 +00:00
16e993e514 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@5796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 14:13:03 +00:00
8d4bf70c7e Fix set_notes prototype to use typedef.
Fix spacey tabs.


git-svn-id: svn://localhost/ardour2/branches/3.0@5795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 14:08:20 +00:00
52607dd6ef Fix warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@5794 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-19 14:06:54 +00:00
69be1aa7bf fix conceptually broken cubic interpolator that failed to handle the i=0 case, and don't rely on inlining for speed there
git-svn-id: svn://localhost/ardour2/branches/3.0@5792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-16 19:53:25 +00:00
4650d86312 more set_state() tweaks to aid with plugin state loading
git-svn-id: svn://localhost/ardour2/branches/3.0@5791 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-16 16:44:16 +00:00
1de578a614 testing post-commit hook after DH server switch
git-svn-id: svn://localhost/ardour2/branches/3.0@5790 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-16 00:04:13 +00:00
f76de9afb9 another set_state() related tweak for handling 2.X sessions
git-svn-id: svn://localhost/ardour2/branches/3.0@5789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-15 20:33:05 +00:00
1aca200a6a more set_state() tweaks to get a 2.X session to load without aborting
git-svn-id: svn://localhost/ardour2/branches/3.0@5788 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-15 19:36:48 +00:00
8713667ec1 rework Stateful::set_state() patch to avoid default version argument
git-svn-id: svn://localhost/ardour2/branches/3.0@5787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-15 18:56:11 +00:00
Carl Hetherington
79f91c7a20 Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty.
LOADING 2.X SESSIONS WITH THIS COMMIT IN PLACE WILL (PROBABLY) CORRUPT THE .ardour FILE,
MAKING THE SESSION UNLOADABLE ON 2.X AND LOSING INFORMATION.

So don't do that unless you make a backup of the session file first.



git-svn-id: svn://localhost/ardour2/branches/3.0@5786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-15 00:57:55 +00:00
Carl Hetherington
09efd82c6a Fix assertion failure when switching from a 2-channel to 1-channel route with the editor mixer open.
git-svn-id: svn://localhost/ardour2/branches/3.0@5785 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 23:47:44 +00:00
39ad06f03b Fix crash on MIDI import.
git-svn-id: svn://localhost/ardour2/branches/3.0@5784 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 23:45:06 +00:00
12598155a2 Don't raise errors on probe.
git-svn-id: svn://localhost/ardour2/branches/3.0@5783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 23:44:48 +00:00
3970ba5d8c Remove deprecated clearlooks options from ardour3_ui_dark.rc
git-svn-id: svn://localhost/ardour2/branches/3.0@5782 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 23:32:58 +00:00
2351326df9 Fix syntax error in ardour3_ui_dark.rc
git-svn-id: svn://localhost/ardour2/branches/3.0@5781 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 23:31:02 +00:00
Carl Hetherington
c17da55eaa Set the scratch bufs count up in passthru_silence, like it's done in passthru.
git-svn-id: svn://localhost/ardour2/branches/3.0@5780 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 22:29:33 +00:00
969713c41e Fix WackyTabs(TM).
git-svn-id: svn://localhost/ardour2/branches/3.0@5779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 21:28:37 +00:00
dcf0af853a Fix display of tool button icons.
git-svn-id: svn://localhost/ardour2/branches/3.0@5778 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 21:24:35 +00:00
1c83f12c68 Fix warnings.
Hopefully that offset is an audio cycle offset, or someone's used the wrong type ;)


git-svn-id: svn://localhost/ardour2/branches/3.0@5777 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 20:41:54 +00:00
07be98b341 (1) silence non-process FIFO message (2) move MIDI state tracking down to the MidiPort level (3) forward port the PRIVATE_JACK pointer "fix" from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@5774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 17:35:33 +00:00
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 16:10:01 +00:00
8c4ce1e2ce writable session patch, forward ported from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@5770 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-13 20:43:28 +00:00
Carl Hetherington
c221b09560 Set up the ControlProtocolManager singleton in a slightly more robust way.
git-svn-id: svn://localhost/ardour2/branches/3.0@5768 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-12 17:46:17 +00:00