Commit Graph

167 Commits

Author SHA1 Message Date
Mads Kiilerich 226ff63e3c temporal: avoid using superclock in Editor::initialize_canvas before creating the session
cb78043adc "Indicate selection extents in time ruler" introduced use of
superclock before it has been set. But as it only is used at time 0, the
actual superclock doesn't matter. Still, we work around it in order to
avoid triggering any warnings of uninitialized use.
2023-09-20 12:30:53 -06:00
Ben Loftis 12f02a685e tweak section-marker height so they fill the whole ruler 2023-09-15 18:04:59 -05:00
Ben Loftis da4d2a645f
remove tempo-mapping bar, tempo_meta group. this reverts 8fbf2c and related 2023-09-06 19:31:00 +02:00
Robin Gareus 774adfb33c
Fix rounding of arrangement markers 2023-09-01 21:53:26 +02:00
Paul Davis da9140a390 polish the way we print tempo numerics in tempo ruler 2023-08-31 10:34:48 -06:00
Paul Davis 43d6d4187c display tempo with only 1 digit of decimals 2023-08-31 10:34:48 -06:00
Paul Davis 076320430a assert() that the tempo & Meter markers associated with a BBT marker exist 2023-08-30 14:16:21 -06:00
Robin Gareus affea2b83b
NO-OP: remove reducant code 2023-08-30 18:31:13 +02:00
Ben Loftis b66e12610b arrangement ruler: create Section marker type, so we can customize it a bit 2023-08-29 23:02:05 -05:00
Robin Gareus 30ed0669c0
Redraw markers when moving them between rulers
When un/setting the CD-marker flag the marker vanished
until the GUI forced a redraw of the ruler.
2023-08-23 03:18:42 +02:00
Paul Davis 1f5db4234c markers: no tooltips for metric markers 2023-08-02 15:23:43 -06:00
Paul Davis e36dfa1f09 change display and interaction for BBT Markers
Draw regular tempo/meter markers for BBT markers, and move them when BBT marker is dragged

This will (does) allow regular editing workflow for the tempo/meter at at BBT marker
2023-08-02 15:23:43 -06:00
Robin Gareus b757dd9fd8
Vertically center markers
see also 64d633cd26
2023-07-03 18:35:56 +02:00
Paul Davis 64d633cd26 amend/fix b490f7d2a1 to correctly (?) place marker text 2023-07-01 21:07:25 -06:00
Paul Davis e756786a13 bbt markers: remove tempo&meter marker on deletion 2023-06-28 18:05:34 -06:00
Paul Davis ac491fce0e bbt markers: now have an (insensitive) tempo and meter marker visible
probably needs more work for event handling on the tempo and
meter markers.
2023-06-28 18:03:38 -06:00
Paul Davis b490f7d2a1 markers: fix position of BBT marker text (tiny tweak) 2023-06-28 18:03:38 -06:00
Colin Fletcher 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
Robin Gareus 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
Robin Gareus 1ee2675716
Implement Selection Marker class and events 2023-05-17 01:50:51 +02:00
Robin Gareus cfba965db3
Prepare Selection Start/End Marker rendering 2023-05-17 01:45:48 +02:00
Paul Davis 6313a61f15 more improvements to text position in tempo mapping bar 2023-04-16 10:32:50 -06:00
Paul Davis 9d2c1232c5 tweak position of tempo text in mapping bar 2023-04-13 14:36:21 -06:00
Paul Davis f7f3c1a920 tempo mapping: fix lifetime management of mapping bar text 2023-04-10 09:18:45 -06:00
Paul Davis 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
Paul Davis 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
Ben Loftis 8b28a284ba Cue markers must be centered after their text is assigned 2022-08-10 15:15:49 -05:00
Paul Davis 014c6e7850 replace INT32_MAX with CueRecord::stop_all (gui) 2022-08-03 11:42:58 -06:00
Paul Davis 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
Paul Davis de2c553e1a improvements to BBT marker dialog appearance and behavior 2022-06-03 13:20:13 -06:00
Ben Loftis 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
Ben Loftis 08768e8185 draw the Stop All Cues marker as a square 2022-02-19 13:39:59 -06:00
Ben Loftis 5a19a4fb4a tempo ruler: remove unused _name_flag for tempo markers 2022-02-14 21:22:36 -06:00
Ben Loftis 8c41fc7dd0 meter ruler: match look of meter markers to tempo markers 2022-02-14 21:22:36 -06:00
Ben Loftis 49e792868f cue ruler: potential crash fix 2022-02-14 21:22:36 -06:00
Ben Loftis f5142fb19a tempo ruler: increase the size of tempo markers. 6pix is too small a target 2022-02-14 21:22:36 -06:00
Ben Loftis daf56ccf0a tempo ruler: do not resize marker (a grabbable object) due to tempo changes 2022-02-14 21:22:36 -06:00
Paul Davis 17e5667216 triggerbox: use translatable marker name function in GUI 2022-02-11 11:33:43 -07:00
Ben Loftis 6c6e7ba2ee cue markers: pixel pushing 2022-02-08 17:04:09 -06:00
Paul Davis 93401d1883 remove debug output 2022-01-27 14:02:34 -07:00
Ben Loftis 9239d8af06 Ruler Marker: replace some padding in Location marks, to accommodate a selected marker 2022-01-21 10:13:15 -06:00
Ben Loftis 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
Paul Davis 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
Paul Davis 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
Paul Davis 03bfb91aff fix argument name (post rebase conflict resolution) 2021-08-13 12:51:36 -06:00
Paul Davis 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
Paul Davis 011b5ec61c remove debug output 2021-08-13 12:51:35 -06:00
Paul Davis d4f52498fa somewhat working dialog for BBT/Position marker creation 2021-08-13 12:51:34 -06:00
Paul Davis 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
Paul Davis 4f1ad4ed0d start adding new BBT marker support 2021-08-13 12:51:34 -06:00