smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity
13025 commits 101 branches 144 tags 307 MiB
Commit graph

92 commits

Author SHA1 Message Date
Robin Gareus
ab44e41dfd change the meters into CairoWidget, add expose_area to CairoWidget::render() 2014-03-20 23:50:40 +01:00
Paul Davis
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
Colin Fletcher
daf4dd874a Add vertical zoom via scroll wheel modifier key to editor summary. 
If the ScrollZoomVerticalModifier key is used with the scroll wheel over
the editor summary pane, zoom the editor vertically.
 2013-06-21 21:28:13 +01:00
Colin Fletcher
741f9de3f7 Make scroll-wheel modifier keys consistent in editor summary pane. 
Separate out the handling of left/right scroll events from normal up/down
ones in the editor summary pane scroll wheel handling, and use the new
constants for scroll wheel keyboard modifiers in conjunction with up/down
scroll events. Modifiers for left/right scroll events should be unaffected
by this.
 2013-06-21 20:44:40 +01:00
Paul Davis
8877199ae0 leftmost_position => leftmost_sample, current_page_frames => current_page_samples 2013-04-12 11:21:12 -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
ecfd2a7455 remove all unit-based methods from (Public)Editor; rationalize Editor::event_frame() to clearly identify whether the passed-in GdkEvent has window units or canvas units (the latter will be true for all events that are handled by the canvas and then passed to Editor 2013-04-12 11:09:49 -04:00
Paul Davis
ee1f0520a8 many changes to get the cairo-canvas version much, much more functional. still problems with a lot of subtle and not-so-subtle issues 2013-04-11 20:19:22 -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
Colin Fletcher
17439ac72c Position playhead correctly on 'P' in editor summary pane, taking account of start offset. Fixes #5213. 
git-svn-id: svn://localhost/ardour2/branches/3.0@13653 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-12 22:10:03 +00:00
Paul Davis
89d1a2fdf5 dramatically speed up the addition of large numbers of busses + tracks. consists of a backend part (ignore JACK graph/latency callbacks while we're adding tracks) and a GUI side (avoid O(N^N) behaviour while adding each new time axis view) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13595 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-04 14:32:28 +00:00
Paul Davis
67e842bf4c remove debugging/analysis output 
git-svn-id: svn://localhost/ardour2/branches/3.0@13589 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-02 02:12:39 +00:00
Paul Davis
12fadcc43e try another fix for the crash created by rev 13547 
git-svn-id: svn://localhost/ardour2/branches/3.0@13554 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-27 13:21:21 +00:00
Robin Gareus
7e8d5ed6d0 fix #5025 part 2 
subscribe to route changes (track delete)

git-svn-id: svn://localhost/ardour2/branches/3.0@13494 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-14 05:01:28 +00:00
Robin Gareus
cbeabee870 fix #5025 part 1 
cairo line may be rounded +-1 px, also invalidating area x<0 is a noop.

git-svn-id: svn://localhost/ardour2/branches/3.0@13493 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-14 05:01:25 +00:00
Colin Fletcher
ee80d2a95f Use accelerator key of "/Editor/set-playhead" action to position playhead in editor summary pane, rather than hard-coding the default accelerator of 'p'. 
git-svn-id: svn://localhost/ardour2/branches/3.0@13106 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-08-02 10:30:48 +00:00
Paul Davis
e284a53349 quiet! 
git-svn-id: svn://localhost/ardour2/branches/3.0@13075 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-24 16:35:59 +00:00
Paul Davis
4bcc3d377c make rendering of the editor summary view a bit more efficient, enable key event handling there and make "p" do what it does in the main canvas (position the playhead) - this needs to be dynamic to follow bindings eventually 
git-svn-id: svn://localhost/ardour2/branches/3.0@13073 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-24 02:58:28 +00:00
Carl Hetherington
ee8634cd87 Set up _old_follow_playhead correctly in all cases; should fix #4603. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12624 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-09 13:19:08 +00:00
Paul Davis
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
Paul Davis
2b7d17e904 reorder editor route list columns to put visible and active first (from joern) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11732 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-20 17:08:07 +00:00
Paul Davis
928c7cf10c thin up the width of the line separating tracks in the editor summary line (by-product: slightly more space appears to be there between the colored blocks representing regions too 
git-svn-id: svn://localhost/ardour2/branches/3.0@11724 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-17 17:19:43 +00:00
Carl Hetherington
40a8ed8808 Update summary on switching playlists (#4659). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11405 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-31 21:56:39 +00:00
Carl Hetherington
b8a93d7a86 Don't redraw the summary every time the playhead moves (if it hasn't moved visibly on the summary), and only redraw the bit that has changed when it does happen. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11208 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-09 18:03:49 +00:00
Carl Hetherington
59526d29fd Fix scroll-wheel direction in summary. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10948 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-09 15:57:59 +00:00
Carl Hetherington
2c07e83e4b Use same modifiers with the mouse wheel in the summary as in the editor (#4543). 
git-svn-id: svn://localhost/ardour2/branches/3.0@10947 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-09 15:44:59 +00:00
Paul Davis
8ad4133d26 don't cache width & height for CairoWidget; provide option for all CairoWidgets to not draw their backgrounds; provide a static method to allow any (Container, probably) widget to provide background color to a CairoWidget without the requirement that it have its own window; remove existing cursor from clocks; clock text no longer has background attribute set, to correct a mistake in my understanding of pango attributes 
git-svn-id: svn://localhost/ardour2/branches/3.0@10673 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-18 15:35:58 +00:00
Carl Hetherington
a12820ab77 Add an option to disable editor update during drags of the 
summary (#4407).


git-svn-id: svn://localhost/ardour2/branches/3.0@10377 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-01 12:19:11 +00:00
Carl Hetherington
f4f5706265 Small tweak to previous commit. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10076 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-14 14:00:03 +00:00
Carl Hetherington
74796c7a53 Clamp left hand side zoom drags of the summary (fixes 
#4317).


git-svn-id: svn://localhost/ardour2/branches/3.0@10075 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-14 13:57:20 +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
7c7853e4ff Prevent unnecessary recomputation of horizontal zoom parameters after a summary move drag. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9341 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-11 18:48:44 +00:00
Carl Hetherington
d9c4625ff5 Don't catch up with the playhead after drags. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8767 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-08 11:46:11 +00:00
Carl Hetherington
ad314252f4 Disable follow playhead during editor summary drags. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8518 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-16 19:33:16 +00:00
Carl Hetherington
150d3fdfbf Watch for route colour changes and update the summary accordingly. Fixes #3692. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8480 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-08 02:35:35 +00:00
Carl Hetherington
0945b96986 Fix summary height scaling problems when there are not enough tracks to fill the editor window. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8305 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-20 15:35:15 +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
Carl Hetherington
8fc660e76e Move mouse cursor stuff out of Editor into its own class. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8048 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-16 14:53:16 +00:00
Carl Hetherington
ba649118f2 Use a couple more cursors in the summary. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8036 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-14 22:03:57 +00:00
Carl Hetherington
fc142a3fe6 Fix up summary mouse cursors. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8035 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-14 21:55:21 +00:00
Carl Hetherington
b8da7d196c Modified version of Lincoln's patch to stop the summary causing very low track heights. Fixes #3527. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7994 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-10 21:56:32 +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
Carl Hetherington
6f61058723 Make it easier to move the summary rectangle around when it is narrow or low in height. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7730 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-02 01:44:27 +00:00
Carl Hetherington
536384ea4e Tweak group tabs class hierarchy and offer the same menu in both editor and mixer. Fixes #3336. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7441 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-19 21:47:07 +00:00
Carl Hetherington
2c09798dc8 Modified version of lincoln's patch to allow X-axis scrolling in the summary when the drag starts above or below (but to the left or right of) the view box. Fixes #3299. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7364 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-04 21:53:34 +00:00
Paul Davis
aef9d4eaeb use the new left/right trim cursor for the editor summary 
git-svn-id: svn://localhost/ardour2/branches/3.0@7279 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-18 02:15:43 +00:00
Carl Hetherington
5e12dc768d Back to real-time zoom. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7278 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-18 02:07:13 +00:00
Carl Hetherington
a54f107d4f Make summary zoom happen based on where the drag is started, rather than 
needing a modifier.  Change mouse pointer shape in the summary to indicate
what will happen on a drag.  Allow vertical zoom in the summary, which modifies
track heights accordingly.


git-svn-id: svn://localhost/ardour2/branches/3.0@7275 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-18 00:05:44 +00:00
Carl Hetherington
bb34b15944 Stop summary showing hidden tracks. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7260 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-15 23:43:51 +00:00