ardour/livetrax
13
0
Fork 0
Code
10,326 Commits 1 Branch 1 Tag 145 MiB
19b6b45a2a
Commit Graph

160 Commits

Author SHA1 Message Date
Paul Davis
19b6b45a2a get xfade drawing back to pre-cc days 2013-04-18 11:18:18 -04:00
Paul Davis
ec8d521e98 semi-fix xfade display, and reduce number of calls to Curve::get_vector() by a factor of two 2013-04-18 09:56:01 -04:00
Paul Davis
ec102f94e1 various work waveview amplitude mgmt; fix playhead cursor drag from timebar click 2013-04-17 15:22:09 -04:00
Paul Davis
b9c94f6dbf remove all calls to Outline::set_outline_width (1) because this is "wrong" when using Cairo - the default is 0.5 and it can remain that way 2013-04-17 10:56:04 -04:00
Paul Davis
96eee9e7a1 change UIConfig to use accessor/setter methods like RCConfig so that ParameterChanged methods can actually be emitted; add variable (over a small range) background shading for all TimeAxisViewItems 2013-04-16 23:46:22 -04:00
Paul Davis
a0044e5f71 add back various functionality to waveviews such as zero line, amplitude scaling 2013-04-16 10:07:52 -04:00
Paul Davis
7e19053b88 Fix dragging objects on the canvas and remove redundant canvas groups 
Delivery of fake motion events to the editor needed the event coordinates to be
in canvas space, as they are with "real" events. Editor and other objects had
many redundant groups from timbyr's work on gnomecanvas to scroll by moving
groups. We don't need this anymore with cairo-canvas (though possibly a
stationay background group for the canvas might be useful again one day as in
the SAE logo. Its implementation would be fairly different though, since we
would have to explicitly move the group on every scroll, since nothing else
ever moves on scroll).

Also tweaks to text item placement, and switch TimeAxisViewItem from
name_pixbuf to name_text, since ArdourCanvas::Text is already "pixbuf optimized".
 2013-04-15 13:50:05 -04:00
Paul Davis
b05968fb4e change frames_per_pixel to samples_per_pixel 2013-04-12 11:31:50 -04:00
Paul Davis
4258a34912 change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample 2013-04-12 11:15:45 -04:00
Paul Davis
7caf517b27 add (bezier) curves to canvas, use for automation lines; fix issue with rectangles missing their upper line segment; more cairo canvas fixes 2013-04-11 22:54:12 -04:00
Paul Davis
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -04:00
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Paul Davis
d99b5dfa37 fix nasty crash when using double-nested compound (consolidated) regions caused by not (re)allocating enough mixdown buffers; fix up various warnings from valgrind about mismatching operator delete[] by using shared_array<T> rather than shared_ptr<T>, as should have been the case all along 2013-03-21 10:14:01 -04:00
Ben Loftis
63a25adb9e keep region trim handle layered on top of crossfade area 
git-svn-id: svn://localhost/ardour2/branches/3.0@13670 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-14 19:44:09 +00:00
Ben Loftis
b8a8abeb8f code cleanup; crossfade shape drawing is now more closely associated with the fade-in shape rather than a separate thing. could probably be consolidated into fewer functions, but this is an interim step for testing. Also remove the use-current-fade-shape option which is not meaningful in new model 
git-svn-id: svn://localhost/ardour2/branches/3.0@13669 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-14 17:21:44 +00:00
Ben Loftis
2292e33ee4 crossfade hack and slash. removed overlap checks, overlap mode, default length, fade_is_xfade, fade_is_short, and other leftovers from previous crossfade models. Draw crossfade drags in realtime so fade_line is no longer needed. remove code for hiding crossfades during a drag. moved crossfade rect to top layer so crossfade lines dont grab mouse focus. drag-trim-with-fixed-fade-anchor is partially implemented and needs discussion 
git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-13 16:42:05 +00:00
Ben Loftis
beb3ec2d7a Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly 
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-20 19:43:43 +00:00
Paul Davis
98834c0532 remove a bunch of cerr output and/or convert to use error<< 
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-13 15:11:07 +00:00
Paul Davis
873921b954 fix erroneous use of scoped_ptr where scoped_array should be used 
git-svn-id: svn://localhost/ardour2/branches/3.0@13353 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-27 00:14:08 +00:00
Paul Davis
9743340fa3 trying to track down why undo doesn't remove xfade rendering on OS X 
git-svn-id: svn://localhost/ardour2/branches/3.0@13102 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-29 23:50:00 +00:00
Paul Davis
9a3d9dcb3c outline fade in/out handles in black (#3828) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13014 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-10 17:19:17 +00:00
Carl Hetherington
392a7fd238 Don't show previously hidden xfades when finishing a region 
drag; should fix #4982.


git-svn-id: svn://localhost/ardour2/branches/3.0@12987 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-04 21:09:32 +00:00
Carl Hetherington
0c714fe3de Simplify management of waveform visibility / shape / scale; 
fixes #4727, I think.


git-svn-id: svn://localhost/ardour2/branches/3.0@12743 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-17 11:48:51 +00:00
Carl Hetherington
a8dd4ec805 Re-show all xfades that we hide during drags (#4933). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12729 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-15 15:01:35 +00:00
Carl Hetherington
98e28bb54b Fix non-updated ordinary fade-outs during trim drags 
(#4903).


git-svn-id: svn://localhost/ardour2/branches/3.0@12537 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-02 10:44:29 +00:00
Paul Davis
9d40a072a4 arguably cleaner tweak to previous commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@12479 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 18:38:54 +00:00
Paul Davis
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
Paul Davis
f9030dd220 merge new symmetric curve from mixbus, fix errors in fade out slow curve, tweak display of xfades so that the non-upper-fade is slightly less dominant (alpha) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12384 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-22 21:23:22 +00:00
Paul Davis
8d828faa64 remove some debug noise from previous commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@12254 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-11 21:33:02 +00:00
Paul Davis
a98fa4bc61 switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate 
git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-11 21:30:36 +00:00
Paul Davis
eaf548f49f don't trim regions in conjunction with xfade trimming unless auto-xfade and full-overlap-xfades are selected 
git-svn-id: svn://localhost/ardour2/branches/3.0@12245 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 21:40:10 +00:00
Paul Davis
916202ea64 a number of tweaks to make xfade GUI stuff better in several different ways, notable during region trims and region drags 
git-svn-id: svn://localhost/ardour2/branches/3.0@12240 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 13:48:23 +00:00
Paul Davis
68e69a8b29 fix height of xfade rendering 
git-svn-id: svn://localhost/ardour2/branches/3.0@12239 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 12:26:49 +00:00
Paul Davis
bed955b409 fix dragging of end xfades 
git-svn-id: svn://localhost/ardour2/branches/3.0@12237 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 02:50:59 +00:00
Paul Davis
e3a9576aed basic xfade dragging 
git-svn-id: svn://localhost/ardour2/branches/3.0@12236 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-10 00:46:22 +00:00
Paul Davis
1b6bac8c54 correctly save & restore xfade state 
git-svn-id: svn://localhost/ardour2/branches/3.0@12231 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-09 22:14:11 +00:00
Paul Davis
7bc425fd0d framework for handling events on the xfade rects 
git-svn-id: svn://localhost/ardour2/branches/3.0@12213 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-08 17:13:59 +00:00
Paul Davis
32e8a804ce return of the visible xfade rect - doesn't do anything yet, however 
git-svn-id: svn://localhost/ardour2/branches/3.0@12203 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-07 22:56:19 +00:00
Paul Davis
18b18a45a5 hide xfades while dragging region(s) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12202 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-07 22:02:17 +00:00
Paul Davis
a47ec8ba59 mostly backup-oriented commit to preserve very initial pass at rendering fades-as-xfades in a more useful way. quite a bit of work to do here 
git-svn-id: svn://localhost/ardour2/branches/3.0@12129 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-01 03:22:04 +00:00
Carl Hetherington
73cf69791b Use shared_ptr for a region view's gain line. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11632 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-09 21:22:09 +00:00
Paul Davis
b02e95f201 make region gain line visibility global, not per-region 
git-svn-id: svn://localhost/ardour2/branches/3.0@11492 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-15 14:03:19 +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
23f2f8f546 Copy local state in AudioRegionView copy constructor. Fixes #4047. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9533 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-16 23:10:58 +00:00
Carl Hetherington
0fa76ceb20 Remove unused constructor. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9532 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-16 23:10:45 +00:00
Paul Davis
b9113772fe restore zero line visibility; change selected region colors back to 2.X version 
git-svn-id: svn://localhost/ardour2/branches/3.0@9157 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-16 13:20:31 +00:00
Paul Davis
477fca0de0 deframe audio regions as well as MIDI when entering internal edit mode 
git-svn-id: svn://localhost/ardour2/branches/3.0@9057 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-03 18:32:06 +00:00
Carl Hetherington
0cdf0433f7 No-op; coding style. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8910 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-20 17:30:02 +00:00
Paul Davis
7a5b6a5031 patches from lincoln to speed up the regionlist and provide region removal (causes dangling shared ptrs to regions, fix to come 
git-svn-id: svn://localhost/ardour2/branches/3.0@8845 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-14 21:49:43 +00:00
Carl Hetherington
4fca993a84 Tidy up region view colouring code slightly. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8770 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-08 14:09:20 +00:00