smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 14:16:31 +01:00
Code Issues Projects Releases Wiki Activity
15066 commits 102 branches 145 tags 313 MiB
Commit graph

94 commits

Author SHA1 Message Date
Paul Davis
c727b1022d ruler markers (i.e. loop) never ever show their name 2014-09-30 15:33:16 -04:00
Paul Davis
ea17268558 skip marker appearance should change to reflect global skip-playback setting 2014-09-29 12:05:23 -04:00
Paul Davis
f25f965e3d make sure vertical line on single-position Marker is visible at creation 2014-09-24 13:00:56 -04:00
Paul Davis
01fa5ba3a2 use Waves' approach to GUI layout (pixel by pixel) to get vertical alignment in arrange area correct (or at least more correct) 2014-09-24 11:37:49 -04:00
Paul Davis
e1fc76485e fix behaviour of range markers when zoom changes. 
Ardour-style markers don't change width when zoom changes; Tracks-style markers do
 2014-09-23 23:27:32 -04:00
Paul Davis
048b6835c5 remove Marker::_shift and fix up order of execution in RangeMarker::_set_position() to stop "wobbling" end line 2014-09-23 15:16:33 -04:00
Paul Davis
e9de0a5415 get initial length of a range marker correct 2014-09-23 15:16:33 -04:00
Paul Davis
0472453d94 many substantive changes in the handling of ARDOUR::Location, Markers and drags/clicks on Markers. 
It would have been nice to split this commit into parts, but it is all very interconnected and was not possible to
subdivide.
 2014-09-23 10:49:21 -04:00
Paul Davis
5bf9f621c4 remove gradient for RulerMarker; retheme loop (RulerMarker) color; tweak vertical placement of marker start/end lines 2014-09-23 10:49:21 -04:00
Paul Davis
e29836232a add ::canvas_height_set() virtual method back to Marker, so we can track canvas height 2014-09-23 10:49:21 -04:00
Paul Davis
2bff69b2fa skip markers respond to single-click by toggling skipping state 2014-09-21 17:38:48 -04:00
Paul Davis
12e7de3f48 start moving responsibility for color management for Markers from Editor into Markers 2014-09-21 17:38:48 -04:00
Paul Davis
f6e9f26045 Markers now hold ptr-to-ARDOUR::Location where appropriate 2014-09-21 17:38:47 -04:00
Paul Davis
9560c4a69e tweak, extend, alter & derive Marker class to match Tracks PRD 2014-09-19 16:24:40 -04:00
Paul Davis
a95ec7ca5b various changes to accomodate skip markers (which span the entire range of an ARDOUR::Location) and to add drag-to-create-skip 2014-09-17 21:42:33 -04:00
Paul Davis
c75b7a3f0f tweak marker drawing and add default_new_marker_prefix string to consolidate default name of new GUI-created markers 2014-09-11 17:00:18 -04:00
Paul Davis
0c326926ab numerous small changes to get close to PRD spec for marker bar display 2014-09-03 14:45:53 -04:00
Paul Davis
8895d86383 initial hacks to display markers as per PRD 2014-09-03 12:16:19 -04:00
Paul Davis
49867edf83 show marker vertical line at all times 2014-09-03 10:28:10 -04:00
Robin Gareus
a17616f1da move utility functions into a dedicated namespace 
Conflicts:
	gtk2_ardour/about.cc
	gtk2_ardour/editor_ops.cc
 2014-08-17 18:51:22 -04:00
Paul Davis
28fdc71d70 more canvas refactoring. 
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
 2014-08-17 17:44:17 -04:00
Paul Davis
3be5f658ea use newly factored canvas in gtk2_ardour 2014-08-17 17:43:03 -04:00
Paul Davis
678b836853 introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group. 
More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
 2014-08-17 14:56:20 -04:00
Paul Davis
b74c871094 remove timebar canvas item from markers 2014-08-17 13:38:40 -04:00
Paul Davis
38ff5bb7ca clamp marker name text appropriately 2014-01-13 09:49:09 -05:00
Paul Davis
c074a8d504 define marker height in one location, to avoid duplicated magic numbers and allow easy changing 2014-01-13 09:39:50 -05:00
Paul Davis
283e3ceb04 move marker text up by 2 pixels 2013-06-26 17:39:27 -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
64c861a791 fix markers so that the blue line spans both canvases 2013-04-15 16:10:13 -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
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
a1745f2cf1 remove debugging output 2013-04-10 10:53:21 -04:00
Paul Davis
053eaf77fd a variety of fixes for the cairocanvas, but it still buggy as hell handling events and lots of other stuff 2013-04-09 14:22:58 -04:00
Paul Davis
18048747b6 fix up marker text color 2013-04-08 19:47:54 -04:00
Paul Davis
fc787fad50 canvas markers now use ArdourCanvas::Text, not ArdourCanvas::Pixbuf, since the latter will be optimized to use Pixbuf too 2013-04-06 16:39:11 -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
Carl Hetherington
4c398b0ad7 Nudge markers up one pixel (should fix #4620). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12394 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-23 15:47:28 +00:00
Paul Davis
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
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
Paul Davis
92bd44e012 remove line parent member from Marker 
git-svn-id: svn://localhost/ardour2/branches/3.0@8359 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-29 13:47:36 +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
aff8e4e941 Fix crash on removing marker. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8023 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-14 11:50:43 +00:00
Carl Hetherington
f83b9d678a Add backgrounds to marker labels. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8021 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-13 22:39:42 +00:00
Carl Hetherington
8496f57fd4 Prevent marker labels overlapping. Fixes #3535. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8015 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-12 22:51:54 +00:00
Carl Hetherington
af5bd3df30 Fix update of range marker names. Fixes #3533. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8012 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-12 18:53:15 +00:00
Carl Hetherington
4527566217 Visual tweaks to marker lines. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8011 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-11 15:21:37 +00:00