13
0
Commit Graph

157 Commits

Author SHA1 Message Date
3c252e9321 lots more fidgety work on automation. sort of works now, but undo/redo needs attention
git-svn-id: svn://localhost/ardour2/branches/3.0@13047 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-17 03:10:40 +00:00
0532e2063b dramatic overhaul of automation. too long to explain here. this work is not finished - write/touch passes do not correctly overwrite existing data because the semantics of ControlList::insert_iterator need clarification. more to follow
git-svn-id: svn://localhost/ardour2/branches/3.0@13038 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-13 21:05:45 +00:00
f1505b631d substantive change to try to provide some rationality for region gain line visibility (and automation line visibility in general
git-svn-id: svn://localhost/ardour2/branches/3.0@12478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-29 18:30:10 +00:00
8d5065bc32 remove, convert, comment several cerr statements
git-svn-id: svn://localhost/ardour2/branches/3.0@12378 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-22 12:57:05 +00:00
Carl Hetherington
e65d84d37c Re-add erroneously-removed methods related to cut/copy of
automation time ranges.


git-svn-id: svn://localhost/ardour2/branches/3.0@12114 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-27 21:34:44 +00:00
ec1ef5d6b5 remove the apparently unnecessary "ui_bind()" macro from entire source base
git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 12:58:19 +00:00
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
b08d13706f remove additional "mid" color from ArdourButton; replace Active/Mid widget state with ExplicitActive/ImplicitActive; represent implicit-active state with colored border around ArdourButton; tune button colors; new rounded_foo() functions, some in use, some not in use right now
git-svn-id: svn://localhost/ardour2/branches/3.0@11466 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-07 17:43:55 +00:00
3c3bceccf9 fix scroll wheel handling on both gain faders and parameter controls in automation track headers
git-svn-id: svn://localhost/ardour2/branches/3.0@10903 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-05 18:17:31 +00:00
Carl Hetherington
5c73926324 Simple ambiguitity-resolution wrapper for gettext; use for
Manual (#4496).


git-svn-id: svn://localhost/ardour2/branches/3.0@10720 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 00:04:44 +00:00
Carl Hetherington
28123e436d Snap new automation points on audio lanes (part of #4297).
git-svn-id: svn://localhost/ardour2/branches/3.0@10570 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-13 16:28:20 +00:00
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
Carl Hetherington
3ba6804f27 Don't create new regions on clicks on MIDI plugin automation
tracks (#4298).


git-svn-id: svn://localhost/ardour2/branches/3.0@10062 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-07 13:45:52 +00:00
Carl Hetherington
80972784e3 Fix non visibility of previously-visible MIDI automation
tracks on session reload.


git-svn-id: svn://localhost/ardour2/branches/3.0@9863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-13 17:13:30 +00:00
6dc74f8c87 clean up GUIObjectState API, and use bools when setting "visible" property rather than string (not that it matters); don't unconditionally set visible to true unless a non-hidden track/bus has no visibility property already
git-svn-id: svn://localhost/ardour2/branches/3.0@9843 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-11 20:32:33 +00:00
Carl Hetherington
216ad7fe90 Fix erroneous characters in automation time axis view GUIObjectState IDs (#4157).
git-svn-id: svn://localhost/ardour2/branches/3.0@9832 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-10 20:54:03 +00:00
574333fef3 fix #4004 - AutomationTimeAxisView wasn't deleting its StreamView in its destructor, leaving a dangling set of objects hanging around after route deletion. Worth noting that the playlist, region(s) and source of the deleted track remain in existence, which is almost certainly wrong but i'll file a new bug for that
git-svn-id: svn://localhost/ardour2/branches/3.0@9829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-10 15:28:09 +00:00
64975776dc improve layout of automation track controls box
git-svn-id: svn://localhost/ardour2/branches/3.0@9803 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-07 17:29:51 +00:00
10cb0a7646 introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor
git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-07 00:37:13 +00:00
bcf936265c fix crash when open automation track for MIDI CC ***BUT** its clear that automation tracks are still broken in a deep way, and particularly for MIDI CC
git-svn-id: svn://localhost/ardour2/branches/3.0@9764 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-23 16:22:34 +00:00
a82b900e44 implement a delete operation that works like "cut" but doesn't put the deleted items in the cut buffer. you will not be able to access this from your keyboard (Delete keyunless you remove your existing ~/.config/ardour3/ardour.bindings file
git-svn-id: svn://localhost/ardour2/branches/3.0@9711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-12 15:50:47 +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
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
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
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
Carl Hetherington
469b390e52 Fix addition of MIDI automation points (#3780).
git-svn-id: svn://localhost/ardour2/branches/3.0@8885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 16:18:45 +00:00
Carl Hetherington
5576faf943 Clean up some confusion with AutomationControls in AutomationTimeAxisViews that have regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@8883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 16:18:27 +00:00
Carl Hetherington
81aef8b491 Minor tidying-up.
git-svn-id: svn://localhost/ardour2/branches/3.0@8882 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 16:18:15 +00:00
d116af22db virtualize the way that AutomationController gets strings to display values, so that we can callback through the owner of an AutomationControl, not just rely on the value from the AutomationControl; make pan automation tracks use this to display more audio-centric values
git-svn-id: svn://localhost/ardour2/branches/3.0@8590 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 18:48:33 +00:00
Carl Hetherington
73192bc1a7 Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-03 22:26:29 +00:00
bb797943dd add configurable colors to stereo panner, plus keybindings for zero width (0), 1 (alt-up) or -1 (alt-down), plus M when its mono
git-svn-id: svn://localhost/ardour2/branches/3.0@8153 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-02 15:51:42 +00:00
b85b4d9e54 make ardour3 build and link on OS X (tiger, at least)
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 05:14:48 +00:00
Carl Hetherington
fd2a9ccdad Fix overflow within libgnomecanvas when passing in a coordinate > INT_MAX. Fixes #3370.
git-svn-id: svn://localhost/ardour2/branches/3.0@7864 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-01 20:16:29 +00:00
Carl Hetherington
74cc8f6067 Fix multiple creation of identical automation tracks. Fixes #3482.
git-svn-id: svn://localhost/ardour2/branches/3.0@7848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-27 18:56:26 +00:00
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
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
Carl Hetherington
136b8ed747 Fix restore of fader automation from 2.X sessions.
git-svn-id: svn://localhost/ardour2/branches/3.0@7754 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-07 23:26:21 +00:00
Carl Hetherington
e7587ea0fb Respect ignore_state_request in all cases on set_automation_state(). Fixes #3416.
git-svn-id: svn://localhost/ardour2/branches/3.0@7704 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-28 16:39:31 +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
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
6d06b12446 Fix reset_objects for MIDI automation views.
git-svn-id: svn://localhost/ardour2/branches/3.0@7551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-06 00:58:51 +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
e7a2b99f3d Clean up handling of track vs region automation a bit.
git-svn-id: svn://localhost/ardour2/branches/3.0@7544 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-05 13:35:43 +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
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
ecb0cd5d11 Make MIDI region `automation' respect the automation mode so that it is
only played back if the automation mode is set to "Play".  Munge AutoState
for AutomationRegionViews so that they reflect their AutomationTimeAxisView's
setting.  Fixes #3135.


git-svn-id: svn://localhost/ardour2/branches/3.0@7304 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-25 20:47:09 +00:00
Carl Hetherington
d0d160e566 Fix crash on clear option for automation tracks (#3195). Also fix state change signalling so that lines reappear on undoing a clear.
git-svn-id: svn://localhost/ardour2/branches/3.0@7178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 12:26:00 +00:00
Carl Hetherington
2881a495ef Make discrete mode work for MIDI automation views. Fixes #3178.
git-svn-id: svn://localhost/ardour2/branches/3.0@7159 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 16:40:35 +00:00
Carl Hetherington
a57b9cdd99 Allow region-based automation axes to report whether they
have automation data or not.  Should fix #3177.


git-svn-id: svn://localhost/ardour2/branches/3.0@7158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 15:51:32 +00:00