Skip to content
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

FCP X XML adapter #309

Merged
merged 11 commits into from
Oct 1, 2018
Merged

FCP X XML adapter #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
885e72a
Basic fcpx xml to otio and vice versa
Aug 13, 2018
5feed74
Merge branch 'master' of https://github.com/PixarAnimationStudios/Ope…
Aug 13, 2018
805d9af
Catch OSError in except
Aug 14, 2018
560bac1
fix lint errors
Aug 14, 2018
790b3e0
replace iteritems() and iterkeys() with items() and keys()
Aug 14, 2018
9640511
use python 3 version of next()
Aug 14, 2018
69bbc41
Proper round trip test and bug fixes for said test
Aug 17, 2018
70fd65a
Use assertIsNotNone instead of assertTrue
Sep 7, 2018
1d9ab83
no longer assuming negative lanes are audio lanes
Sep 29, 2018
d2cd4aa
Use SerializableCollection to handle multiple sequences
Sep 29, 2018
4a5efd8
Fix linting errors
Sep 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions opentimelineio_contrib/adapters/contrib_adapters.plugin_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"OTIO_SCHEMA" : "PluginManifest.1",
"adapters": [
{
"OTIO_SCHEMA": "Adapter.1",
"name": "fcpx_xml",
"execution_scope": "in process",
"filepath": "fcpx_xml.py",
"suffixes": ["fcpxml"]
},
{
"OTIO_SCHEMA": "Adapter.1",
"name": "hls_playlist",
Expand Down
Loading