50fea864db
rationalize and coordinate handle of region (time axis view item) opacity.
...
There are still some bugs with this because of the waveview image cache - fixes coming soon.
2014-06-13 12:22:39 -04:00
a245250409
use the alpha/opacity value for the region base whether track colors are in use or not
2014-06-12 18:14:55 -04:00
551014240a
drag handles no longer exist as distinct item types (failed experiment)
2014-06-12 14:51:51 -04:00
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
7a05dde39d
Use a dumb cache for waveview ImageSurfaces. This halves the size of the
...
previous one, but usually ends up using three of them at the current
CACHE_HIGH_WATER setting.
Should result in a smaller memory footprint for sessions with
multiple copies of nearby audio segments (electronic style).
The downside is the larger memory footprint for linear recording
sessions if CACHE_HIGH_WATER > 1 (1 giving a max of two
half - sized cache entries per audio stream).
2014-06-08 01:47:38 +10:00
64701f3955
remove needlessly-added method
2014-06-05 15:22:26 -04:00
ad346dc638
reinstate a canvas group where we reparent regions while dragging, so that they are always on top.
...
I mistakenly removed this during the onecanvas changes.
2014-06-05 15:16:55 -04:00
05f476875b
tweak logic for region coloring, particularly when muted
2014-06-05 14:12:58 -04:00
94b0d3bc25
remove unused label_color from TimeAxisViewItem
2014-06-05 12:04:42 -04:00
39eec5ac1b
hopefully fix up selection of color for region name text, under all conditions
2014-06-05 12:04:42 -04:00
8accb22923
put back bottom line of region views if name highlight is not shown.
...
Also remove redundant line that replicated the one we modified.
2014-04-18 05:08:17 -04:00
78bab09e98
improve comment text
2014-04-16 07:35:20 -04:00
e324249d8c
fix logic for Config->show_name_highlight (reversed from inital experiments)
2014-04-16 07:30:09 -04:00
981754781a
use new config option to control name highlight and name placement
2014-04-16 06:35:24 -04:00
55bfe10fa6
make frame/trim handles transparent for now.
...
This is a new GUI feature that will not be completed for the 3.6 release, so just hide them.
2014-04-14 04:46:24 -04:00
c2885671c6
avoid multiple requests for redraws when resetting a TimeAxisViewItem name highlight
2014-03-11 07:37:20 -04:00
72965e411f
improve (though not 100% perfect) handling of region trim handles and mouse mode interaction
2014-03-10 12:14:37 -04:00
1beed21c8a
don't show frame trim handles when in internal editing mode
2014-03-07 12:27:48 -05:00
0c9120de8f
do not show region trim handles unless in (effective) object mouse mode
2014-03-05 14:40:49 -05:00
ed05292898
fix height of time axis item view trim frame handles
2014-02-25 13:38:05 -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
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
7970437975
tweak pixel-level dimensions and positioning
2014-01-10 11:56:55 -05:00
bec4be41d6
use new DragHandle canvas object
2014-01-02 16:50:00 -05:00
10c8b48235
tweak design of time axis view item name text handling
2014-01-02 14:29:07 -05:00
6085d8c15c
remove debug output, try a new approach to name text placement
2014-01-02 13:44:57 -05:00
03bf8b826f
debug output for time axis item name font handling
2014-01-02 10:02:28 -05:00
4886eb7098
try to rationalize logic for displaying/hiding regionview (time axis view item) name highlights and text
2013-12-29 23:10:54 -05:00
7bbd28aa08
notable changes to try to improve most of enter/leave handling for canvas items
2013-10-30 23:36:30 -04:00
b00751d0dc
fix up ordering/timing of naming for TimeAxisViewItem (so that canvas debugging is more useful)
2013-10-25 13:30:01 -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
0e656f0a13
workaround/hack/fix for cairo pattern gradient space exceeding 2^16 size limit
2013-06-27 10:41:00 -04:00
24acef66be
use W3C color difference computation to select black or white text for region name text
2013-06-26 17:40:10 -04:00
a1f858d3b2
an awful lot of tweaks to drawing details
2013-06-24 16:28:53 -04:00
bebe2af95a
merge with master
2013-05-08 14:48:28 -04:00
7de31d5a41
use virtual bool canvas_group_event () in TimeAxisViewItems to get suitably delegatable/inherited event handling
2013-04-25 16:06:12 -04:00
737433c446
tweaks to improve enter/leave event handling - fixes at least some crashes caused by this stuff
2013-04-24 18:31:00 -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
d1a05240ef
fix clamping of line and rect coordinates to avoid issues with cairo when drawing way outside a surface's dimensions; move various coordinate methods down to Canvas, because they don't require GTK information; make visible_area() a Canvas virtual method so that we don't have to cast to call it
2013-04-17 10:53:17 -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
393ba98422
tweak time axis view item text positioning; allow ArdourCanvas::Text to have its width clamped, and use this as TAVI's get narrow so that text doesn't overflow
2013-04-15 14:45:22 -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
204da61f98
remove incorrect merge of cairocanvas patch that stopped most tracks from displaying; add more debugging info
2013-04-10 14:42:36 -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
35cbfc9c0a
improve international understanding.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 13:29:55 +00:00
3fbdae0d69
pluralis suckusmatis
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 13:07:57 +00:00
Carl Hetherington
6b3b3dcced
Fix extended region names on reloading sessions with short regions (part of #4493 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12408 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-23 23:39:36 +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
Carl Hetherington
01659c1d73
Patch from colinf to fix selection of short regions ( #4744 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-30 23:00:15 +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
cc7d4db5fe
Fix a few framecnt / framepos type confusions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-14 22:04:51 +00:00
4085309cdb
make Stateful::_id private and provide appropriate methods to set it, and use them throughout ardour
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 13:18:47 +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
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
e89d8af65b
Fix non-appearance of MIDI region names ( #3891 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9483 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-05 14:40:53 +00:00
6215c3ceac
add separate color for the border of a selected time axis view item
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-14 19:36:41 +00:00
89d6f40e33
forward unhandled button events from MidiRegionView back to Editor
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9068 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-04 15:16:21 +00:00
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
2c72f58aa1
experiment with making MIDI region boxes vanish when in note/internal edit mode ... to be continued
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9054 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 14:51:02 +00:00
Carl Hetherington
b7ec5b4b40
Option to colour region background using the track colour ( #3759 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8778 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 20:01:55 +00:00
Carl Hetherington
87fdfecf74
Change the background colour of regions when they are small enough to not show the name bar ( #3575 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 14:09:42 +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
Carl Hetherington
ce91b0953b
Remove always-true should_show_selection code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8769 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 14:08:05 +00:00
Carl Hetherington
ff6038a7b7
Minor tidy-up.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8768 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 14:06:58 +00:00
Carl Hetherington
39fc90abda
Fix region name highlight drawing slightly ( #2948 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8031 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 17:26:50 +00:00
aad157337c
correct version of: port cairo ARGB/BGRA -> pixbuf RGBA patch from recent 2.X commit (restores text on canvas), in which i move some functions around, rename stuff and add comments
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7846 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-26 13:33:39 +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
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
d5c1e67c56
put a gray line above the region view name highlight; make region view name highlight the correct height - there was a 1 pixel gap at the bottom
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7775 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 18:56:41 +00:00
da8eec7a83
remove Glib::ustring from gtk2_ardour
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 16:51:02 +00:00
Carl Hetherington
ea2648503b
Cleanup of region drag code to be a bit more efficient and shorter. Fixes crashes when dragging regions to the wrong track type.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-06 12:34:11 +00:00
Carl Hetherington
ba225736a4
Don't give automation region views left/right trim handles. Fixes #3428 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7727 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-01 22:35:46 +00:00
Carl Hetherington
064c6287cd
Remove fade handles from recording regions. Fixes #3322 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7444 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-19 23:26:10 +00:00
Carl Hetherington
3d7487c9be
Tweak region view wave height. Fixes #3318 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7436 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-17 00:56:27 +00:00
Carl Hetherington
da67628bcf
Patch from Lincoln ( #3319 ) to make the range selection box not display trim handles but make it trimmable along the whole edge. Also clean up record box rendering.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-16 20:03:16 +00:00
ce78296f96
move computation of TimeAxisViewItem fixed heights into a static member function and call early in process life, because we need the values in MidiStreamview - fixes a bug with notes not aligning with note lines in a new session
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7220 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 15:57:31 +00:00
Carl Hetherington
0130c1e821
No-op: copy-edit comments, remove duplicate comments, coding style.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 11:03:00 +00:00
6ef5d85ae1
changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 15:33:04 +00:00
Carl Hetherington
1a1edc9ca1
Make a new action "escape", bound to the Escape key, and make it
...
abort a drag (if one is in progress) or clear the selection.
Fix breaking of drags in a few cases; some still to do.
git-svn-id: svn://localhost/ardour2/branches/3.0@6467 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-08 01:28:15 +00:00
738387f9a4
remove a couple of boost::signals2 trouble spots; fix some --strict compile time warnings
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6378 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-20 16:50:41 +00:00
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
Nick Mainsbridge
3367e41278
Remove unused pre_drag_region_selection, fix ugly regions when drag-copying (TimeAxisViewItem constructor), fix broken drag threshold, don't reset _grab_frame etc. when move threshold passed, fix region selection during region copy drag.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6348 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 12:13:59 +00:00
Carl Hetherington
681e7baa89
Fix crash that I introduced with a recent bug fix.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 18:13:25 +00:00
Carl Hetherington
c9dda81a69
Move region name slightly to partially fix #2948 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-03 02:34:24 +00:00
Carl Hetherington
00617d5494
Fix previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-03 02:22:36 +00:00
Carl Hetherington
3538c47d25
Fix #2947 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6266 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-03 00:14:24 +00:00
926f53244d
carl's wondrous DnD VBox patch - processor boxes are now vboxes and not listviews - which included a couple of minor marker/time axis view patches for opaqueness etc.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6174 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 14:37:20 +00:00
ff9ddf5100
tidy up (a bit) locations editing widget ; use pixbuf/string code from 2.0;remove edit point clock
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6074 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-12 20:39:53 +00:00
bb9cc45cd2
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
...
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent...
git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 16:10:01 +00:00
5328a114c9
time line items now have 64 bit location + duration; start making note resize apply across regions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5642 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-09-09 02:09:04 +00:00
7f9aea14e9
region trimming and height patch from lincoln. great work
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5507 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-10 03:07:48 +00:00
bcc929a5b6
waf build works on OS X ; new bindings file and processing system in place for mnemonic-us
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5498 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-08 22:36:32 +00:00
Carl Hetherington
b65f8073ba
Fix some unused parameter warnings.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 15:55:17 +00:00
Carl Hetherington
402cc384ce
Back out big shared_ptr change. Moving to a branch. Apologies all.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 17:58:13 +00:00
Carl Hetherington
4297071b3f
Use shared_ptr for the TimeAxisView hierarchy.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5339 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:39:45 +00:00
Carl Hetherington
0874426a5b
Further refactoring of drag code. Changes so that drags from the region list display a region view during the drag.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@5127 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-08 19:28:51 +00:00