Commit Graph

151 Commits

Author SHA1 Message Date
b490f7d2a1 markers: fix position of BBT marker text (tiny tweak) 2023-06-28 18:03:38 -06:00
96eb7652c9 fix warning from fallthrough comment typo
Fix "warning: this statement may fall through [-Wimplicit-fallthrough=]",
caused by the misspelling of "fallthrough" as "fallthough" in
editor_ops.cc.

Note that if you use ccache, you'll need to clear its cache to actually
get rid of the warning, because the pre-processed file (with comments
removed) is identical before & after this change, and thus won't get
recompiled otherwise.

Fix the equivalent typos in marker.cc too, though in those cases there's
no actual warning, because presently all the fall-throughs are from empty
cases.
2023-06-09 16:45:31 +01:00
dbebc0b7e0
Make Markers properly themable, use color-names
This simplifies code, and also immediately changes marker
colors when the theme is changed.
2023-05-18 01:26:35 +02:00
1ee2675716
Implement Selection Marker class and events 2023-05-17 01:50:51 +02:00
cfba965db3
Prepare Selection Start/End Marker rendering 2023-05-17 01:45:48 +02:00
6313a61f15 more improvements to text position in tempo mapping bar 2023-04-16 10:32:50 -06:00
9d2c1232c5 tweak position of tempo text in mapping bar 2023-04-13 14:36:21 -06:00
f7f3c1a920 tempo mapping: fix lifetime management of mapping bar text 2023-04-10 09:18:45 -06:00
518fc7754f tempo mapping: half-way towards working drags again
For some reason, mid-drag changes are not visible
2023-04-09 14:36:03 -06:00
965fe9946b BBT markers: put BBT position in their tooltip
Tooltip will need updating once drag is working correctly
2022-08-17 16:39:46 -06:00
8b28a284ba Cue markers must be centered after their text is assigned 2022-08-10 15:15:49 -05:00
014c6e7850 replace INT32_MAX with CueRecord::stop_all (gui) 2022-08-03 11:42:58 -06:00
6dfaac9e94 redesign the mechanisms for updating tempo/meter display during drags and other map changes
We now simply move markers during drags, and do not seek to create/delete markers.

When the map is changed, we rebuild the markers from scratch. This might need optimization to avoid doing
when the editor itself changed the map.
2022-06-27 22:21:27 -06:00
de2c553e1a improvements to BBT marker dialog appearance and behavior 2022-06-03 13:20:13 -06:00
c2243d8b1c ruler markers: consolidate range-marker shapes
* if the same color is used for the marker and the flag, some range markers looked odd
* now that rulers are highlighted when you hover, it's less necessary to disambiguate by shape
2022-03-17 18:12:04 -05:00
08768e8185 draw the Stop All Cues marker as a square 2022-02-19 13:39:59 -06:00
5a19a4fb4a tempo ruler: remove unused _name_flag for tempo markers 2022-02-14 21:22:36 -06:00
8c41fc7dd0 meter ruler: match look of meter markers to tempo markers 2022-02-14 21:22:36 -06:00
49e792868f cue ruler: potential crash fix 2022-02-14 21:22:36 -06:00
f5142fb19a tempo ruler: increase the size of tempo markers. 6pix is too small a target 2022-02-14 21:22:36 -06:00
daf56ccf0a tempo ruler: do not resize marker (a grabbable object) due to tempo changes 2022-02-14 21:22:36 -06:00
17e5667216 triggerbox: use translatable marker name function in GUI 2022-02-11 11:33:43 -07:00
6c6e7ba2ee cue markers: pixel pushing 2022-02-08 17:04:09 -06:00
93401d1883 remove debug output 2022-01-27 14:02:34 -07:00
9239d8af06 Ruler Marker: replace some padding in Location marks, to accommodate a selected marker 2022-01-21 10:13:15 -06:00
60cbe57a6e Marker Rulers: changes to match mini-timeline aesthetic
Highlight ruler lanes when you enter, instead of showing many lines
2022-01-20 18:59:21 -06:00
41ade3b024 add a distinct Marker type enum for cue markers
Plan is to change the shape before this is considered done; for now
it uses the same shape as a regular marker
2022-01-19 09:06:38 -07:00
c916d3d952 Substantial overhaul of tempo display code
Major changes: do not delete and recreate markers and curves for every tempo map
change, attach tempo curves directly to their (preceding) tempo marker, notable
cleanup of TempoCurve class to remove unnecessary members.

More tweaks expected since algorithm for matching markers and tempo map
points is not correct yet.
2022-01-18 19:47:20 -07:00
03bfb91aff fix argument name (post rebase conflict resolution) 2021-08-13 12:51:36 -06:00
7938d8de4f fix (some) editing based on tempo & meter marks
After beginning an edit operation with TempoMap::write_copy(), the tempoPoint and meterPoint objects
referenced by markers are incorrect, since they refer to the original map, not the copy we are working
on. Fix this with Editor::reassociate_metric_markers()

Some instances requiring this fix may still remain
2021-08-13 12:51:35 -06:00
011b5ec61c remove debug output 2021-08-13 12:51:35 -06:00
d4f52498fa somewhat working dialog for BBT/Position marker creation 2021-08-13 12:51:34 -06:00
5153124664 change (GUI) Marker objects to accept any Canvas::Item as parent, and use this to draw BBT position markers in the BBT ruler 2021-08-13 12:51:34 -06:00
4f1ad4ed0d start adding new BBT marker support 2021-08-13 12:51:34 -06:00
42c38d313d try to use RCU updating when dragging tempo markers 2021-08-13 12:51:30 -06:00
f8df966914 clean up MeterMarkerDrag 2021-08-13 12:51:30 -06:00
749a49c278 incorporating new tempo map API 2021-08-13 12:51:29 -06:00
7433bc27e0 intermediate, unfinished snapshot of ongoing timeline types work on GTK GUI 2021-08-13 12:51:29 -06:00
11798f7e86 fix crash caused by not explicitly deleting the line component of a Marker (#8737) 2021-06-11 10:24:49 -06:00
b167e6f2ed fix crash when deleting a marker
the line (if non-null) is owned by the marker's group, and will be deleted when the group is
2021-05-18 18:02:22 -06:00
60a972a7de implement region marker deletion 2021-05-18 18:01:38 -06:00
91ec860b3b redesign color mgmt when entering/leaving markers of various kinds 2021-05-18 16:17:37 -06:00
689d33ddd5 get line for region markers functioning and visible 2021-05-14 18:37:50 -06:00
b4d7944750 place the line associated with markers in the cursor scroll group, so that it above everything else 2021-05-14 18:37:50 -06:00
3c1ffd1743 add line height API to Marker
This will allow region markers, which do not span the whole canvas height, to have a line
2021-05-14 18:37:50 -06:00
1685843082 global marker objects do not need a canvas height, so remove member and API to manage it
They extend (down) from an origin to COORD_MAX. The height is irrelevant
2021-05-14 18:37:50 -06:00
738cdcc55c tweaks to ArdourMarker to enable it to be used for RegionCue markers 2021-05-14 18:37:50 -06:00
a1c68460be add basic/initial code for action to add a region marker 2021-05-14 18:37:50 -06:00
319b029579 When a marker is selected, change the marker color in addition to the line color. 2019-12-09 07:49:30 -06:00
4050ca5633
Update GPL boilerplate and (C)
Copyright-holder and year information is extracted from git log.

git history begins in 2005. So (C) from 1998..2005 is lost. Also some
(C) assignment of commits where the committer didn't use --author.
2019-08-03 15:53:15 +02:00