smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-29 18:07:42 +01:00
Code Issues Projects Releases Wiki Activity
8182 commits 103 branches 145 tags 317 MiB
Commit graph

204 commits

Author SHA1 Message Date
Paul Davis
537a5c2fcb merge -r 13599:13629 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13630 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-10 15:28:22 +00:00
Paul Davis
26741db3c4 merge -r 13414:13599 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 ; plus a few tweaks that will be cleaned up soon 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13600 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-05 14:33:11 +00:00
Paul Davis
6c52612009 merge 12954:1363 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13364 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-29 16:50:05 +00:00
Paul Davis
00d891e347 more adaptations to the latest changes in SG API 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13198 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-09-26 18:40:44 +00:00
Paul Davis
680ea1118c merge 13034:13103 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13107 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-08-02 14:33:56 +00:00
Paul Davis
3bb7d368a8 merge 12791:13034 from 3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13105 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-08-02 00:04:51 +00:00
Paul Davis
14aac7e210 merge 12717:12791 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12792 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-20 03:53:34 +00:00
Paul Davis
a2bb5c1feb merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-24 19:01:24 +00:00
Paul Davis
d6edbf5ca2 merge 12096:12268 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12269 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-14 18:35:19 +00:00
Paul Davis
9c8b57aab0 SG: merge 3.0 from 11783-12096 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12097 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 17:06:21 +00:00
Carl Hetherington
5de4de613b Fix memory leak on error condition (#4798). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11775 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-01 15:06:24 +00:00
Carl Hetherington
d7deaa21bb Fix reference of track after free() (#4795). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11773 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-01 14:58:09 +00:00
Paul Davis
40af4b914f use musical_time_equal() test for equality when copying note data, not strict floating point equality. should fix #4609 (and maybe another one too) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11407 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-31 23:20:13 +00:00
Carl Hetherington
9237c7411c Catch exception thrown by SMF code when it cannot write 
to a file (#4640).


git-svn-id: svn://localhost/ardour2/branches/3.0@11259 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-18 02:10:40 +00:00
Carl Hetherington
9c8a27c664 Don't round control list events when x-scaling them; prevents large loss of accuracy with xfades when they are scaled to be small and then expanded again (#4602). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11125 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-31 13:25:29 +00:00
Paul Davis
5f88b44245 (1) do not write sequential same-value automation data into a ControlList (2) thin AutomationList data when reloading from disk (similar code as Ben's from ardour 2.X, but without user-adjustable thinning density at present). Should fix #4583 and maybe others caused by NaN's occuring from zero-slope lines 
git-svn-id: svn://localhost/ardour2/branches/3.0@11078 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-26 22:13:54 +00:00
Paul Davis
2449a787c5 fix a build issue in Evoral that was preventing Sequencer<T>::dump() from being available, and expose operator<< for Sequence<T> 
git-svn-id: svn://localhost/ardour2/branches/3.0@11054 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-22 02:09:39 +00:00
David Robillard
efe14fbd52 Fix broken whitespace via merciless application of the emacs hammer. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10782 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-23 00:17:31 +00:00
Paul Davis
2929cd1c36 tweak debug output 
git-svn-id: svn://localhost/ardour2/branches/3.0@10780 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-22 20:29:41 +00:00
Carl Hetherington
6e1aa92eb8 Doxygen tweaks. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10644 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-16 02:03:30 +00:00
David Robillard
18c2ee4a26 Remove dubious Evoral::Event methods that exposed non-const references to members. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10239 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-19 18:11:31 +00:00
Paul Davis
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger 
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-30 17:55:14 +00:00
Paul Davis
a8449db466 finish the intention of the previous commit, correctly this time 
git-svn-id: svn://localhost/ardour2/branches/3.0@9979 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-11 16:06:31 +00:00
Paul Davis
1f845c0e32 do not assert/abort out of data errors that may originate with external user-supplied data, and use PBD::error instead 
git-svn-id: svn://localhost/ardour2/branches/3.0@9978 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-11 15:58:28 +00:00
Paul Davis
dd6e76ad89 add skeleton for i18n support 
git-svn-id: svn://localhost/ardour2/branches/3.0@9977 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-11 15:57:48 +00:00
Paul Davis
921358a5f3 remove remnant of MIDI I/O debugging 
git-svn-id: svn://localhost/ardour2/branches/3.0@9937 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-07-26 16:24:41 +00:00
Paul Davis
c99738d88e try to fix data loss at end of a capture pass for MIDI - add a new virtual method to MidiSource that specifies what should be done with stuck notes, remove duplicate(i hope) _last_flush_frame from SMFSource that mirrored, more or less, MidiSource::_last_write_end; use new virtual method when stopping after capture. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9910 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-07-20 18:13:03 +00:00
Carl Hetherington
26666fce42 Remove an assert() that I can't see the value of, and which 
trips when loading empty MIDI files (#4190).


git-svn-id: svn://localhost/ardour2/branches/3.0@9883 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-07-16 20:55:14 +00:00
Paul Davis
a5efa9a500 initial pass at session-renaming functionality 
git-svn-id: svn://localhost/ardour2/branches/3.0@9876 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-07-14 17:41:06 +00:00
Paul Davis
160f1493fa more midi io debugging 
git-svn-id: svn://localhost/ardour2/branches/3.0@9868 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-07-13 20:14:53 +00:00
Paul Davis
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
Paul Davis
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
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
d22cd939a3 Remove unused NascentInfo::is_touch member. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9386 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-20 01:24:25 +00:00
Carl Hetherington
51e368f3f0 Fix assertion failure when merging a set of nascent events which start at the same time as the last event in a ControlList. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9384 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-20 01:24:10 +00:00
Carl Hetherington
47018e771d Fix erroneous masking when loading bank changes (part of #3916). 
git-svn-id: svn://localhost/ardour2/branches/3.0@9359 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-16 15:10:25 +00:00
Paul Davis
8177e85bf9 fix mismatching use of operator new() when allocating buffer to passed into libsmf - should be malloc'ed 
git-svn-id: svn://localhost/ardour2/branches/3.0@9339 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-09 15:36:54 +00:00
David Robillard
0906b39918 Fix my name :) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9302 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-06 15:00:16 +00:00
Carl Hetherington
7178f031ba Patch from Joskar to use scientific pitch notation for MIDI note names (#3867). 
git-svn-id: svn://localhost/ardour2/branches/3.0@9188 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-23 13:17:35 +00:00
Carl Hetherington
d2bcfc0747 Allow out-of-time-order writes to nascent event list, sorting before merge. Fixes #3537. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9103 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-08 12:34:25 +00:00
Carl Hetherington
64e43bf4b1 Fix crash with debug enabled. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8613 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-29 19:36:01 +00:00
Paul Davis
15b5fce904 merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally). 
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-27 01:31:03 +00:00
Carl Hetherington
f8ebb4582d Unify program change and bank handling so that they are manipulated together. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8346 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-28 18:19:40 +00:00
Carl Hetherington
3ec58e478c Allow deletion of program changes in the same way as notes. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8304 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-20 13:30:31 +00:00
Carl Hetherington
ad916f6241 Fix a few bad iterator accesses. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8231 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-09 21:35:33 +00:00
Carl Hetherington
5c23faaa0d Allow trim of midi regions to before the start of the source (better, this time). Fixes #3156. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8229 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-09 21:34:46 +00:00
Carl Hetherington
56554af08f Revert previous ill-thought-out patch. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8213 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-07 19:55:43 +00:00
Carl Hetherington
f3fc6195bc Allow trim of midi regions to before the start of the source. Fixes #3156. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8212 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-07 19:16:23 +00:00
Paul Davis
b83f21c3cf add "shift" method used in 2.X and now a3 to move data starting at a position, not an iterator 
git-svn-id: svn://localhost/ardour2/branches/3.0@8208 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-07 15:13:04 +00:00