Commit Graph
251 Commits
Author SHA1 Message Date
itsmattkc 9264a2f856 Merge pull request #1330 from ThomasWilshaw/OTIO_load
OTIO load
2022-01-07 19:35:38 -08:00
Thomas Wilshaw da00d94b60 Fix string creation 2022-01-07 01:24:29 +00:00
Thomas Wilshaw 764c7bb088 Add tr to string and fix variable name 2022-01-07 01:20:38 +00:00
Thomas Wilshaw 5624b03e65 Merge branch 'OTIO_load' of https://github.com/ThomasWilshaw/olive into OTIO_load 2022-01-07 00:03:34 +00:00
Thomas Wilshaw 836903cbe9 Fix PR comments 2022-01-07 00:02:46 +00:00
itsmattkc 3960f54e9c code: moved project version related variables to project class 2022-01-06 12:50:40 -08:00
ThomasWilshaw b865bfa963 Merge branch 'master' into OTIO_load 2022-01-06 13:56:08 +00:00
itsmattkc 38372791f6 Merge pull request #1806 from ThomasWilshaw/otio_save_track_length
saveotio: Make sure all tracks are the same length
2022-01-03 13:16:05 -08:00
itsmattkc 9d5ec1e60f Merge branch 'node-view-show-ctx' 2022-01-02 12:15:55 -08:00
Thomas Wilshaw b6e6b89461 saveotio: Make sure all tracks are the same length 2021-12-19 16:38:29 +00:00
itsmattkc ab42396c26 Merge pull request #1797 from ThomasWilshaw/otio_save_fix
saveotio: Fix external reference available media
2021-12-10 19:21:45 -08:00
Thomas Wilshaw b2b28344f4 saveotio: Use correct frame rates
available_range is the total length of the source clip and is stored
using the same frame rate as the source clip.

source_range is the length of the clip in the timeline and so is
stored using the sequence frame rate.
2021-12-10 22:25:42 +00:00
Thomas Wilshaw dcaf34c69d saveotio: Use qIsNan rather than comparison 2021-12-10 17:34:51 +00:00
Thomas Wilshaw 516c5cb3b1 saveotio: Use built in function and check for NaN 2021-12-10 16:46:21 +00:00
itsmattkc 1828c2fd73 otio: update to be v0.14 compliant 2021-12-01 15:41:05 -08:00
itsmattkc 24a11e2dad fixed mistakes in export task 2021-11-25 15:12:44 -08:00
Thomas Wilshaw cb0ebb24a4 saveotio: Fix external reference available media 2021-11-25 13:18:01 +00:00
itsmattkc a6af473f53 reimplemented node positioning and deleting 2021-11-17 12:09:41 -08:00
Thomas Wilshaw 90a0077c02 Fix uninitialized memory build error
Join Sequences and timelines together in a QMap for simpler code.
2021-11-15 15:10:26 +00:00
itsmattkc 65446fd70b export: use export timebase instead of original 2021-11-10 22:28:37 -08:00
Thomas Wilshaw dc11358b85 loadotio: Update loading bar 2021-11-09 14:50:34 +00:00
Thomas Wilshaw 04a0b6024e otioload: Add simple dialog to change settings
Adds a table of sequences in the OTIO file and allows the settings to
be changed. The dialog takes a list of sequences and relies on each
OTIO timeline having a unique name.

The dialog has to be called from the main thread so there is a wrapper
function in Core.
2021-11-09 14:44:51 +00:00
itsmattkc 4173eb3c49 conform audio to planar in the decoder 2021-10-13 16:01:26 -07:00
itsmattkc 20cf77d8f2 cache: show background caching in task manager
Allows users to cancel and monitor total progress.
2021-10-09 19:33:17 -07:00
itsmattkc 8277748719 render: avoid hashing null node 2021-09-21 21:32:20 -07:00
itsmattkc dc7f7a6dda formalized valuehint as a class 2021-09-21 20:13:14 -07:00
itsmattkc 0df7012c9e rewrote hashing 2021-09-20 21:14:15 -07:00
itsmattkc a77166c833 fixed otio issue 2021-09-20 21:12:44 -07:00
itsmattkc 7ba5dca4ab renderer: always hash along edges 2021-09-19 23:11:20 -07:00
itsmattkc b07bccb7dc nodes: revert to single output 2021-09-07 22:01:36 -07:00
itsmattkc cb5d776dab Merge pull request #1562 from ThomasWilshaw/otio_merge_fixes
Fixes for OTIO merges
2021-08-24 19:26:35 -07:00
Thomas Wilshaw 64a3cb5c84 Replace undo commands with non undoable functions. 2021-08-17 13:13:02 +01:00
itsmattkc 474c27405f Merge branch 'transition-offsets' 2021-08-16 21:29:36 -07:00
itsmattkc 9dad2ef104 transitiontool: updated 2021-08-16 21:28:13 -07:00
itsmattkc d0bc01ebd4 export: use viewer params not export params
Fixes #1703
2021-08-14 11:19:54 -07:00
Thomas Wilshaw 850b75fe24 Transitiosn and gaps are now added. Also removed unnecessary code 2021-08-07 15:06:50 +01:00
Thomas Wilshaw 1d2341245b Correctly add footage nodes and setup contexts. 2021-08-07 14:30:15 +01:00
itsmattkc 6995ffe015 reworked timeline elements 2021-08-01 11:05:18 -07:00
Thomas Wilshaw 2bdd5a3707 Update to master 2021-07-28 15:52:24 +01:00
Thomas Wilshaw c86b7f6185 Make sure Olive doesn't overwrite OTIO files. 2021-07-28 15:15:01 +01:00
Thomas Wilshaw 332351d1d9 Move FolderAddChild to correct place to avoid duplicates 2021-07-28 15:15:01 +01:00
Thomas Wilshaw 0154cfc1c2 Place footage into its own folder 2021-07-28 15:15:00 +01:00
Thomas Wilshaw 79b9d0b26b Fix shadow variable. 2021-07-28 15:14:59 +01:00
Thomas Wilshaw 5b2d889a4c Add footage to root folder and set labels correctly. 2021-07-28 15:14:59 +01:00
itsmattkc 52c5617159 undo: wrapped redo/undo functions to ensure prepare is called 2021-07-17 00:14:24 -07:00
itsmattkc c41047ab02 timeline: reorganized undo commands
Split commands between several files rather than having them all in two monolithic ones.
2021-07-16 01:38:20 -07:00
itsmattkc 4bbc75392a nodes: rewrote and simplified length signaling system 2021-07-15 21:00:18 -07:00
itsmattkc 310fd3541a various: greatly simplified job times
Hopefully this doesn't break everything
2021-07-11 23:33:21 -07:00
itsmattkc 8a58ee2bdb renderer: use iterator rather than creating vectors
Creating vectors from the FrameHashCache was one of the slowest functions in the program, this should be significantly faster.
2021-07-11 16:47:12 -07:00
itsmattkc e2bbff5078 bump project version 2021-05-28 17:57:38 +10:00