itsmattkc
77d4b18a60
updated copyright year for 2021 [skip ci]
2021-04-17 18:56:50 +10:00
itsmattkc
b22c2f48ff
Merge branch 'otio_improvments' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-otio_improvments
2021-04-10 11:07:51 +10:00
itsmattkc
d7557f8e74
Merge branch 'otio_transition' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-otio_transition
2021-04-10 10:55:49 +10:00
itsmattkc
cb75e37e77
moved several files around
...
Mostly moved classes that became node derivatives into the node/ folder.
2021-04-08 12:15:59 +10:00
itsmattkc
898ea25e89
finished merge of viewer and footage
2021-04-06 13:08:56 +10:00
itsmattkc
9fad1efe1b
wrap otio classes in compiler definition
2021-04-02 15:29:17 +11:00
itsmattkc
e0e4e42096
corrected otio files
2021-02-18 13:21:16 +11:00
itsmattkc
d1a3e22eaa
fixed linux compilation issues
2021-01-31 10:39:14 +11:00
itsmattkc
7849d6f3ff
corrections for non shared ptrs in OTIO code
2020-12-16 14:32:18 +11:00
ThomasWilshaw
a937238bd0
Merge branch 'master' into otio_improvments
2020-12-04 16:08:38 +00:00
itsmattkc
f8ceefff6c
don't use shared ptr on projects
...
Really unnecessary
2020-11-27 14:24:02 +11:00
ThomasWilshaw
a30d86f411
Merge branch 'master' into otio_transition
2020-11-18 18:27:30 +00:00
itsmattkc
b3c3fe0fc8
merged video and audio nodes into a single media node
...
They performed exactly the same function so I don't think we need the clutter.
Also bumped the project version, but old projects are automatically converted.
2020-11-18 13:48:14 +11:00
itsmattkc
75d4cd899b
use hardcoded namespace
...
The macro defined namespaces confused the hell out of lupdate and more or less broke translations permanently. Looks like the only way we can do it is to have a hardcoded namespace, which goes against my instinct, but honestly how likely is it that we'll change the namespace anyway (I guess forks might want to do it, but that's their problem ;) )
2020-11-17 20:24:42 +11:00
itsmattkc
d241090a9f
finally updated the copyright year
2020-11-17 20:13:22 +11:00
Thomas Wilshaw
7f4b676318
Move OTIO macro to define.h
...
Move the OTIO macro to define.h to avoid having to add it to all
required files.
Also add some cleanup.
2020-11-12 13:44:50 +00:00
Thomas Wilshaw
a1d967efe6
OTIO: Use macro OTIO for opentimelineio::v1_0
...
Exapnd the use of the OTIO macro and add the version number macro.
2020-11-11 22:13:14 +00:00
itsmattkc
3c1ac3eeba
upgraded to ocio v2
2020-11-11 21:53:24 +11:00
Thomas Wilshaw
3f0768a1cc
Add support for transitions when loading OTIO files
...
OTIO transitions are now added to the timeline as cross dissolves with
the appropriate in/out points,
Also added a safety check when dealing with media references.
2020-11-08 12:23:37 +00:00
itsmattkc
253dd86da8
updated OTIO functions for renamed functions
2020-10-24 10:13:06 +11:00
itsmattkc
bc60c74562
finalized very, very basic OTIO support
...
Ironed out various project and footage loading issues, and a single
cache invalidation issue.
2020-10-23 01:26:17 +11:00
itsmattkc