ardour/livetrax
13
0
Fork 0
Code
8,375 Commits 1 Branch 1 Tag 149 MiB
8a98f466f9
Commit Graph

129 Commits

Author SHA1 Message Date
Carl Hetherington
a4434809e1 Use a list of ControlPoints to hold the automation selection, 
rather than a time range.  This makes more sense now that we
display every point on an automation line, rather than just
a subset.  Makes the code a fair bit simpler, and should fix
some unexpected behaviours, especially when cutting automation
points.


git-svn-id: svn://localhost/ardour2/branches/3.0@12054 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-22 14:03:07 +00:00
Carl Hetherington
ca96b9afe8 Remove some unused code. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12052 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-21 23:54:20 +00:00
Carl Hetherington
23973bae24 A few tweaks to make Ardour build in GCC -std=c++0x mode. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11983 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 19:28:44 +00:00
Paul Davis
49240fe7c5 Draw all automation points, rather than trying to use a heuristic to show some 
at any given zoom level. 

This works because (1) automation data is obtained by sampling, and we control
the sampling interval (2) automation data is filtered to remove co-linear
points before becoming part of a ControlList. 

This commit removes some of the hairiest code in Ardour's GUI, which was
responsible for figuring out which invisible control points were affected by an
edit. The change is based on an experiment in mixbus done by Ben Loftis.


git-svn-id: svn://localhost/ardour2/branches/3.0@11798 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-05 16:53:55 +00:00
Carl Hetherington
3120bae8b4 Don't leave internal edit mode when clicking on an automation region view (#4747). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11749 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-22 16:41:23 +00:00
Carl Hetherington
de53e1154b Fix problems with selecting control points in AutomationRegionViews with non-zero region start. Firstly, determine_visible_control_points considers a subset of the AutomationLine's points if start is non-zero, and this must be taken into account when matching up AutomationLine points with AutomationList points. Secondly, _offset should not part of the calculation when converting model position to session frames. Fixes #4338. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10151 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-28 00:36:30 +00:00
Carl Hetherington
5f9fb85b77 Fix crash when selecting automation points in MIDI 
regions with non-zero starts (#4177) and also fix
problems with selection conversions between
ControlPoints and PointSelection in similar regions.


git-svn-id: svn://localhost/ardour2/branches/3.0@9866 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-07-13 19:24:46 +00:00
Paul Davis
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
David Robillard
ed626628b5 Delete trailing whitespace 
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-06-01 17:00:29 +00:00
Carl Hetherington
a7a6bd1256 Remove duplicate connect_to_list() call. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9410 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-23 00:02:49 +00:00
Carl Hetherington
408d433842 Tiny cleanup. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8634 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-01 01:05:39 +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
a97d522a4f Fix display of MIDI automation on regions with non-zero _start. Should fix #3504. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8257 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-12 22:25:27 +00:00
Carl Hetherington
6fff4dcdda Small cleanups. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8255 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-12 20:14:19 +00:00
David Robillard
8b68ed57ec Fix some messed up code (spacey tabs). 
(There is faar more of this... FIX YOUR EDITORS!)


git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-25 20:37:39 +00:00
Carl Hetherington
ef62a039b9 Fix rounding of automation view point positions. Fixes remainder of #3329. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7869 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-10-02 00:28:13 +00:00
Paul Davis
ede4ecbb00 megaopus patch #2 for today: remove nframes64_t and sframes_t from source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 18:20:37 +00:00
Paul Davis
10bdce85a0 megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t 
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 16:24:22 +00:00
Carl Hetherington
86244875a4 Allow drags of automation in time ranges where the automation is on a MIDI track and may span different regions. Fixes #3366. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7765 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-09 21:35:28 +00:00
Paul Davis
6e904b1e16 3.0 version of rev 5564 from 2.x - basic boolean plugin parameter automation (no graphical editing intended). this involved adding a new "toggled" property to Evoral::Parameter 
git-svn-id: svn://localhost/ardour2/branches/3.0@7670 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-23 16:31:34 +00:00
Carl Hetherington
822ee79d84 Limit region-based automation to the edges of regions. Fixes #3201. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7662 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-20 22:43:10 +00:00
Carl Hetherington
efe60474d6 Hopefully fix up automation control point selection (finally). 
git-svn-id: svn://localhost/ardour2/branches/3.0@7592 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-11 01:23:03 +00:00
Carl Hetherington
48063c15df Improve ctrl-click behaviour of automation points. Should fix #3385. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7584 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-10 01:52:49 +00:00
Carl Hetherington
c06c6c153d Fix up selection of automation points. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7556 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-06 23:28:44 +00:00
Carl Hetherington
b99721ec3b Remove somewhat confusing view_to_model_coord_x method. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7546 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-05 13:37:04 +00:00
Carl Hetherington
5e3ca4db5c Support cut / copy / paste of MIDI automation. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7545 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-05 13:36:38 +00:00
Carl Hetherington
cc6016400b Allow rubberband selection of MIDI automation points. Fixes 
git-svn-id: svn://localhost/ardour2/branches/3.0@7535 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-04 15:41:55 +00:00
Carl Hetherington
97c8ad6564 Make Clear option work for MIDI automation tracks. Fixes part of #3137. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7523 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-31 00:44:26 +00:00
Carl Hetherington
2aaec8beeb Fix list corruption when modifying a view point in y only. Should fix #3329. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7450 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-20 16:53:30 +00:00
Carl Hetherington
66062a85b6 Fix binding of automation list undo records to MIDI sources. Should fix the remainder of #3203. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7411 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-14 12:27:37 +00:00
Carl Hetherington
593b421180 A few fixes to interpolation of MIDI controller data. Don't interpolate 
when writing these data back to a source, otherwise surprising new
interpolated points appear in MIDI automation.  Similarly don't interpolate
when reading the model during MIDI stretch.  Fix handling of interpolation state;
controllers that have been set by the user to use a different interpolation style
are noted in the <Source> tag of the session file and this state is sprayed around
to MidiModel and the GUI as necessary.


git-svn-id: svn://localhost/ardour2/branches/3.0@7409 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-14 00:58:15 +00:00
Carl Hetherington
8d747e647a Make AutomationLine set up interpolation style for its list as appropriate. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7405 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-12 00:42:06 +00:00
Paul Davis
b1c3a22498 fix from 2.X for automation line clear command using the wrong object in the memento command 
git-svn-id: svn://localhost/ardour2/branches/3.0@7134 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-21 15:08:57 +00:00
Carl Hetherington
7e6014a077 Fix track height menu. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7093 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-11 00:09:41 +00:00
Carl Hetherington
50dd880d7e No-op: rename a few variables and add/fix some comments. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6818 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-01 01:07:24 +00:00
Paul Davis
14b0ca31bc handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-30 15:18:43 +00:00
Carl Hetherington
37dd777c9a Fix confusion about last_pointer_* variables under snap. 
Update verbose canvas cursor correctly when automation point drags are clamped.
Clamp multi-point automation drags horizontally.


git-svn-id: svn://localhost/ardour2/branches/3.0@6474 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-11 19:36:29 +00:00
Carl Hetherington
c115b3d71c Update verbose cursor correctly when y drags are clamped. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6469 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-08 19:55:37 +00:00
Carl Hetherington
5f8f481172 Fixes to permit drags of multiply-selected automation control points. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6450 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-05 02:22:58 +00:00
Carl Hetherington
0f79f67398 Some cleanups to drawing of automation line control points. Drag all selected automation points if one selected point is dragged. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6437 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-03 00:08:58 +00:00
Carl Hetherington
c88716665a Fix confusion between model and view points when dragging ranges. Clamp both top and bottom when dragging vertically. Fix some wacky formatting. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6436 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-02 02:10:49 +00:00
Carl Hetherington
9a6532def2 Stop automation drags when they hit their lowest point, so as to prevent automation curves being lost by dragging things too far downwards. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6434 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-02 01:32:14 +00:00
Carl Hetherington
f5acf93672 First cut of some Pro-tools inspired editing features; linked play/play range 
and linked object/range modes.


git-svn-id: svn://localhost/ardour2/branches/3.0@6431 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-01 22:11:15 +00:00
Carl Hetherington
de4c9d4750 Small refactoring of determine_visible_control_points. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6382 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-22 01:11:06 +00:00
Paul Davis
f450df300c fully implement and deploy explicit x-thread signal connection syntax (testing comes next) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-21 18:23:07 +00:00
Paul Davis
aae367b63c use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters 
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-19 20:26:31 +00:00
Paul Davis
f6fdd8dcbf switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash 
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-17 18:24:23 +00:00
Paul Davis
8687895abb remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime 
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-12 15:02:15 +00:00
Paul Davis
64dc5427e4 make all use of bind/mem_fun be explicitly sigc:: 
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-11 23:29:48 +00:00
David Robillard
f24da84806 Fix whitespace. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5889 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-23 05:17:14 +00:00