Skip to content

Feature/marker support #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 69 commits into
base: main
Choose a base branch
from
Open

Feature/marker support #32

wants to merge 69 commits into from

Conversation

vade
Copy link
Contributor

@vade vade commented Jul 2, 2025

This PR

  • introduces basic timeline / stack marker drawing to the OTIO Reader app,
  • fixes some SwiftUI anti-patterns like having conditional logic in view rendering.
  • fixes selection issues
  • updates timeline frame calculations to better and more consistently draw the timeline content on various screen sizes
image

vade added 8 commits July 2, 2025 09:10
@vade
First step to marker support - some test data borrowed from OTIO Core…
0e1ac30 
… project

Signed-off-by: vade <vade@vade.info>
@vade
Draft of marker view
b954b1b 
Signed-off-by: vade <vade@vade.info>
@vade
Wire basic marker view up - need to validate placement logic
9341ab2 
Signed-off-by: vade <vade@vade.info>
@vade
Fix marker position on main stack
e5b5ccd 
Signed-off-by: vade <vade@vade.info>
@vade
Better marker drawing
5e1907c 
Signed-off-by: vade <vade@vade.info>
@vade
Xleanup
feaf3bc 
Signed-off-by: vade <vade@vade.info>
@vade
more tweaks
5ddfecf 
Signed-off-by: vade <vade@vade.info>
@vade
Nicer marker drawing
fb3f35e 
Signed-off-by: vade <vade@vade.info>
@vade vade force-pushed the feature/marker-support branch from b77e981 to fb3f35e Compare July 2, 2025 13:10
@vade vade mentioned this pull request Jul 2, 2025
Open
vade added 13 commits July 2, 2025 17:30
@vade
Cleanup
db33aab
@vade
Fix alignment of TimelineRuler canvas to allow for "overdraw" fixing O…
ec64360 
…penTimelineIO#25
@vade
First step to marker support - some test data borrowed from OTIO Core…
54a979d 
… project

Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Draft of marker view
f06acad 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Wire basic marker view up - need to validate placement logic
883836b 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Fix marker position on main stack
54f871f 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Better marker drawing
fca8c66 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Xleanup
432011b 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
more tweaks
800bd79 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Nicer marker drawing
170009b 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Cleanup
ad8bba6 
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Fix alignment of TimelineRuler canvas to allow for "overdraw" fixing O…
3b30da9 
…penTimelineIO#25

Signed-off-by: Anton Marini <vade@vade.info>
@vade
Fix error
3c7cc4d 
Signed-off-by: Anton Marini <vade@vade.info>
@vade vade force-pushed the feature/marker-support branch from dd8e090 to 3c7cc4d Compare July 2, 2025 21:51
vade added 6 commits July 3, 2025 13:14
@vade
Merge branch 'feature/marker-support' of https://github.com/Synopsis/…
f5c2125 
…OpenTimelineIO-AVFoundation into feature/marker-support

# Conflicts:
#	OpenTimelineIO-Sample/OpenTimelineIO-Reader/Views/TimeRulerView.swift
@vade
Update README.md
4a0ae69 
Signed-off-by: vade <vade@vade.info>
@vade
We dont need @State as we arent editing content in the OTIO TImeline,…
79c5917 
… Tracks or Items.

Signed-off-by: vade <vade@vade.info>
@vade
Same here
75c35ce 
Signed-off-by: vade <vade@vade.info>
@vade
Add scrollview optimization
773cbd1 
Signed-off-by: vade <vade@vade.info>
@vade
Add placeholder media which we can add to our composition if we cant …
835c252 
…find, or we cant load

Signed-off-by: vade <vade@vade.info>
vade added 30 commits July 3, 2025 14:05
@vade
Allow default hit testing
00a0cd8 
Signed-off-by: vade <vade@vade.info>
@vade
Attempt to fix a timing ambiguity / interpretation issue in the Premi…
d571523 
…ere Pro OTIO usage of global start time.

Signed-off-by: vade <vade@vade.info>
@vade
Update our time scale logic to better reflect a semantic that OTIO ex…
0cef719 
…pects.

Signed-off-by: vade <vade@vade.info>
@vade
Add defensive checks for min frame durations to be valid and non zero…
0b3a73d 
…, fixing some MXF introspection bugs.

Signed-off-by: vade <vade@vade.info>
@vade
Add a fix for mxf support.
0661178 
Signed-off-by: vade <vade@vade.info>
@vade
Add a fix to discover local files that may be referenced off of an ot…
26a8083 
…io exported from a different machine with different root file paths.

Signed-off-by: vade <vade@vade.info>
@vade
Scheme was missing for some reason?
dcb6c37 
Signed-off-by: vade <vade@vade.info>
@vade
Beta 4
fa38527 
Signed-off-by: vade <vade@vade.info>
@vade
Update README.md
af8cf30 
add mxf codec notes

Signed-off-by: vade <vade@vade.info>
@vade
Update README.md
4e01d78 
Signed-off-by: vade <vade@vade.info>
@vade
First step to marker support - some test data borrowed from OTIO Core…
aa69e8c 
… project

Signed-off-by: vade <vade@vade.info>
@vade
Draft of marker view
24cd6a5 
Signed-off-by: vade <vade@vade.info>
@vade
Wire basic marker view up - need to validate placement logic
d3b7c86 
Signed-off-by: vade <vade@vade.info>
@vade
Fix marker position on main stack
02055bf 
Signed-off-by: vade <vade@vade.info>
@vade
Better marker drawing
7114ad7 
Signed-off-by: vade <vade@vade.info>
@vade
Xleanup
240ae63 
Signed-off-by: vade <vade@vade.info>
@vade
more tweaks
40946f1 
Signed-off-by: vade <vade@vade.info>
@vade
Nicer marker drawing
8ceb8b8 
Signed-off-by: vade <vade@vade.info>
@vade
Cleanup
b6bf13a 
Signed-off-by: vade <vade@vade.info>
@vade
Fix alignment of TimelineRuler canvas to allow for "overdraw" fixing O…
597c4c3 
…penTimelineIO#25

Signed-off-by: vade <vade@vade.info>
@vade
Draft of marker view
8589d6d 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Wire basic marker view up - need to validate placement logic
e2e7636 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Fix marker position on main stack
0b9ef6b 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Better marker drawing
fc3df51 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
Signed-off-by: vade <vade@vade.info>
@vade
Xleanup
cc9453c 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
Signed-off-by: vade <vade@vade.info>
@vade
more tweaks
2d36954 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
Signed-off-by: vade <vade@vade.info>
@vade
Nicer marker drawing
798aaf1 
Signed-off-by: vade <vade@vade.info>
Signed-off-by: Anton Marini <vade@vade.info>
@vade
Fix alignment of TimelineRuler canvas to allow for "overdraw" fixing O…
e9dafc6 
…penTimelineIO#25

Signed-off-by: Anton Marini <vade@vade.info>
Signed-off-by: vade <vade@vade.info>
@vade
Fix error
94472ff 
Signed-off-by: Anton Marini <vade@vade.info>
Signed-off-by: vade <vade@vade.info>
@vade
Merge branch 'feature/marker-support' of https://github.com/Synopsis/…
dd1c023 
…OpenTimelineIO-AVFoundation into feature/marker-support
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@vade