ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity
39,051 Commits 90 Branches 19 Tags 258 MiB
Commit Graph

79 Commits

Author SHA1 Message Date
Ben Loftis da4d2a645f
remove tempo-mapping bar, tempo_meta group. this reverts 8fbf2c and related 2023-09-06 19:31:00 +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
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
Paul Davis b8af596a92 update all marker positions after a tempo map change 2023-07-15 11:08:45 -06:00
Paul Davis 64d633cd26 amend/fix b490f7d2a1 to correctly (?) place marker text 2023-07-01 21:07:25 -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
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 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
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 daf56ccf0a tempo ruler: do not resize marker (a grabbable object) due to tempo changes 2022-02-14 21:22:36 -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 83b9424082 fix namespace error (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 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
Paul Davis f8df966914 clean up MeterMarkerDrag 2021-08-13 12:51:30 -06:00
Paul Davis 749a49c278 incorporating new tempo map API 2021-08-13 12:51:29 -06:00
Paul Davis 7433bc27e0 intermediate, unfinished snapshot of ongoing timeline types work on GTK GUI 2021-08-13 12:51:29 -06:00
Paul Davis 60a972a7de implement region marker deletion 2021-05-18 18:01:38 -06:00
Paul Davis 91ec860b3b redesign color mgmt when entering/leaving markers of various kinds 2021-05-18 16:17:37 -06:00
Paul Davis 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
Paul Davis 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
Paul Davis 5ab6807710 NOOP: whitespace adjustment 2021-05-14 18:37:50 -06:00
Paul Davis a1c68460be add basic/initial code for action to add a region marker 2021-05-14 18:37:50 -06:00
Robin Gareus 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
Paul Davis 30b087ab3d globally change all use of "frame" to refer to audio into "sample". 
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
 2017-09-18 12:39:17 -04:00
Robin Gareus b976bf8986 NO-OP whitespace & foratting of header files 2017-07-01 21:19:56 +02:00
Thomas Brand 63ea7b6516 NO-OP whitespace (updated GH PR #357) 2017-07-01 19:28:26 +02:00
nick_m 3a7bc1fd3f Tempo Marks : set point colour by discontinuity, display non-quarter pulse if we are non-quarter. 
- a jump in tempo by more than 1 ntpm results in a red
	 tempo mark pointer.

	- ignore UIConfiguration::get_allow_non_quarter_pulse()
	  when displaying note type in the marker text (only display
	  note type if we are non-quarter).
 2017-02-27 20:16:10 +01:00
Robin Gareus b47bfc0121 Update Marker display style: consistent height & color 2016-12-19 13:27:22 +01:00
nick_m c1b950373f Amend last commit - remove some code. 2016-08-20 05:41:12 +10:00
nick_m 869a9cb5df Swap tempo/meter colours when hovering. Use entered marker for these as well. 
- Note : entered_marker modifies the 'p' press, locating to the
	  currently hovered-over marker.
 2016-08-20 04:36:52 +10:00
nick_m 058b781258 Tempo ramps - tempo marker's mark indicates curve height ar point. 2016-05-27 23:38:16 +10:00
Robin Gareus cec17c7660 gtk2 ardour doc updates 2016-03-31 01:16:07 +02:00
Robin Gareus e1f168de11 rename Marker class 
Classes are in the global namespace.
OSX has a flat namespace and OSX32bit/Carbon has a Marker too.
 2015-07-23 17:58:40 +02:00
Robin Gareus c14f6c59db apply font-scale to overall layout (rulers, track-header) - fixes #6088 2014-12-28 15:01:49 +01:00
Paul Davis 6a5d805b38 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-06-22 11:41:05 -04:00
Paul Davis 0796ccfb65 use newly factored canvas in gtk2_ardour 2014-06-21 11:44:22 -04:00
Paul Davis ee8fb7758a remove timebar canvas item from markers 2014-06-03 16:10:27 -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 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 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 aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00