ce08ec0de0
substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring.
...
Group tabs now also get the text drawn in an appropriately contrast-y color
2014-06-09 23:29:00 -04:00
nick_m
e495577f98
Use global clip level from prefs. Restore clip colour, \
2014-06-09 02:50:14 +10:00
ac33bb4256
streamline logic for setting waveform colors
2014-06-05 14:12:58 -04:00
05f476875b
tweak logic for region coloring, particularly when muted
2014-06-05 14:12:58 -04:00
39eec5ac1b
hopefully fix up selection of color for region name text, under all conditions
2014-06-05 12:04:42 -04:00
5696199daf
remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done
2014-06-03 16:10:27 -04:00
fc9e6651dd
remove unused variable
2014-06-03 16:09:06 -04:00
6894b1c7de
initialize variables
2014-05-31 15:18:43 +02:00
12d4989067
show fade+trim handles only if the operation is possible
2014-05-31 15:15:46 +02:00
ef3c27bc1d
session fade-region-visible is for fades - not controls
2014-05-31 14:16:15 +02:00
f0536816ab
reduce outline of fade-in/active rectangle to line
2014-05-31 14:00:28 +02:00
1c32e45771
show x-fade-rectangle only when hovering
2014-05-31 14:00:04 +02:00
9decd39de9
reset [trim] fade handle position if track-height changes
2014-05-31 04:17:47 +02:00
4843c5d5cf
towards region-trims preserving fade duration
2014-05-31 03:53:59 +02:00
7e44308471
replace use of Curve with XFadeCurve.
2014-05-29 03:10:22 +02:00
034f3dafd7
Revert "cairo sub-surface prototype & example
...
This reverts commit c57fcde78cf1f8f89fcb
2014-05-28 19:13:25 +02:00
f1f8f89fcb
exercise subsurface rendering for x-fade curves
2014-05-28 17:38:42 +02:00
4cf93fffc2
x-fade drawing rework, part one
2014-05-27 16:37:01 +02:00
cadf07e362
global one-time setup of waveform preferences.
...
see note in previous commit.
2014-05-27 16:37:01 +02:00
a8f11b6004
persistent waveform shape setting.
...
NOTE: the call to set_global_shape() only needs to happen once,
presumably in a hook in the editor that catches Config::Changed
The same is true for waveform-scale and clipping. But for now it's
at least consistent.
2014-05-27 16:37:01 +02:00
3131ab8bbd
new transport option, "loop-is-mode" which optionally changes the role of the "play loop" button.
...
If enabled, then the button simply changes the behaviour of the "play" button rather than actually starting playback. If disabled
transport behaviour should be unchanged from before.
2014-04-17 09:47:06 -04:00
344f326919
use Canvas::Curve for drawing xfades
...
Pixel-by-pixel we shall rule the earth.
2014-02-26 18:52:14 -05:00
0bcf3001f5
fiddle with single pixel adjustments to time axis view item heights; fix region gain envelope visibility
2014-02-25 12:02:50 -05:00
156a5a0e5f
add the with-guard-point distinction to region gain lines
2014-02-20 14:01:40 -05:00
d93050661c
reinstate zero line in waveforms (can be hidden by changing the color to something with alpha=0
2014-02-14 14:03:07 -05:00
7e34ce96c6
fix up placement of fade out handle
2014-02-14 10:21:51 -05:00
e9e08f59ce
fix up details of time axis view item drawing.
...
* remove top and bottom edges - rely on track edges for that.
* move right edge of time axis view items 1 pixel right to get a much
nicer effect when splitting regions. the end line and start line
of two adjacent regions are now on the same pixel.
* adjust audio region view components to be properly placed.
still need to do ghost regions and MIDI regions
2014-02-13 18:18:19 -05:00
2c79f74e49
correctly (?) indicate muted status of audio regions
2014-01-26 16:03:04 -05:00
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
395c3d35d1
tweak up pixel-level positioning
2014-01-10 11:54:32 -05:00
33cf341381
avoid 1 pixel overlap of end xfade
2014-01-07 22:51:41 -05:00
c22459d1b5
fix a whole set of errors in the placement of xfade visual elements (not 100% finished)
2014-01-07 20:55:04 -05:00
68af0fdc07
fix up visibility control for automation lines
2013-12-31 13:28:20 -05:00
e7059e5a16
remove use of canvas property_foo() since it did nothing (and has now been removed)
2013-12-31 11:54:38 -05:00
28759617c4
Revert "switch fade in/out lines to ArdourCanvas::Curve rather than ArdourCanvas::PolyLine, though for no apparent benefit"
...
This reverts commit e169f5c17f
2013-12-27 11:24:56 -05:00
9fb3247350
rationalize color handling for fade in/out handles
2013-12-09 22:04:13 -05:00
e169f5c17f
switch fade in/out lines to ArdourCanvas::Curve rather than ArdourCanvas::PolyLine, though for no apparent benefit
2013-12-09 21:02:42 -05:00
ba26316857
make region fade in/out curve shapes into PolyLines not Polygons so that they don't close the stroke path at the top/bottom
2013-10-31 15:39:29 -04:00
ff560fa361
remove debug output
2013-10-31 11:48:36 -04:00
7bbd28aa08
notable changes to try to improve most of enter/leave handling for canvas items
2013-10-30 23:36:30 -04:00
d7a16f7de6
'gtk2_ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC)
2013-10-03 09:12:02 +01:00
af3056769c
changes to waveform clipping display
...
* clip level is now -0.9dbFS
* display of clipping is optional (see Theme Manager window)
* clipping is based on disk data, unscaled by region gain
2013-06-28 20:21:30 -04:00
7a7e937d8e
more waveform drawing/coloring changes
...
* move color-regions-using-track color into UI config, not RC config
* consolidate all waveform coloring into AudioRegionView::set_one_waveform_color()
2013-06-28 11:31:26 -04:00
a1f858d3b2
an awful lot of tweaks to drawing details
2013-06-24 16:28:53 -04:00
1c74a3ab2d
waveform drawing improvements
...
* handle logscaled and rectified
* put dark tips in right places
* improve color selection algorithm
2013-06-21 13:17:37 -04:00
594a8c1221
set waveform color to a V-reduced version of the frame fill color.
2013-06-20 23:11:40 -04:00
a0c5de281a
fix crash when recording, because the audioregion view has no frame handles
2013-06-18 08:22:25 -04:00
e2f0c5f91e
merge resolution with master
2013-05-02 20:21:54 -04:00
3973ce81b3
remove all of Gtk::Window::set_position (WIN_POS_MOUSE) for anything deriving from ArdourDialog or ArdourWindow; move the set_position() call into those classes' constructors, so that they are called before the windows are realized, and thus it actually works
2013-05-02 18:13:35 -04:00
47f9d7fa12
do not lower waveforms to the bottom of their group - they are supposed to be above the time axis view item frame, not below it
2013-04-27 09:23:08 -04:00
6f664c1f67
many pervasive changes primarily related to waveform drawing, particular content-dragging, colors, and more
2013-04-24 15:42:14 -04:00
9fdf60b637
change widths of fade lines
2013-04-20 16:11:40 -04:00
41abef90d0
fix up "other" fade line colors in xfades, and switch to using canvas var "CrossfadeLine" for crossfade "lines" rather than "GainLine"
2013-04-18 21:30:12 -04:00
55d7e8da19
reset xfade colors after theme change
2013-04-18 14:21:53 -04:00
19b6b45a2a
get xfade drawing back to pre-cc days
2013-04-18 11:18:18 -04:00
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
ec102f94e1
various work waveview amplitude mgmt; fix playhead cursor drag from timebar click
2013-04-17 15:22:09 -04:00
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
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
a0044e5f71
add back various functionality to waveviews such as zero line, amplitude scaling
2013-04-16 10:07:52 -04:00
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
b05968fb4e
change frames_per_pixel to samples_per_pixel
2013-04-12 11:31:50 -04:00
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
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
19bd641915
commit immediately post linking
2013-04-04 18:45:27 -04:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
