Skip to content

Conversation

reinecke
Copy link
Collaborator

@reinecke reinecke commented Feb 4, 2020

Fixed issue where CMX3600 adapter would try to add the same clip to multiple tracks.
Also addressed an issue where certain clip properties were being set up in per-track a loop when they didn't need to be.

Fixes #642

…ultiple tracks. Also moved some code out of a loop it didn't need to be in.
@codecov-io
Copy link

codecov-io commented Feb 4, 2020

Codecov Report

Merging #644 into master will increase coverage by 0.2%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           master    #644     +/-   ##
========================================
+ Coverage   81.69%   81.9%   +0.2%     
========================================
  Files          72      72             
  Lines        2732    2768     +36     
========================================
+ Hits         2232    2267     +35     
- Misses        500     501      +1
Flag Coverage Δ
#py27 81.67% <ø> (ø) ⬆️
#py36 81.67% <ø> (-0.01%) ⬇️
#py37 81.67% <ø> (ø) ⬆️
Impacted Files Coverage Δ
src/opentime/rationalTime.cpp 88.88% <0%> (+3.03%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update afc69b9...344198b. Read the comment docs.

Copy link
Collaborator

@jminor jminor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Thanks for fixing this.

@ssteinbach ssteinbach added this to the Public Beta 12 milestone Mar 17, 2020
@ssteinbach ssteinbach merged commit 0303169 into AcademySoftwareFoundation:master Mar 17, 2020
andrewmoore-nz added a commit to andrewmoore-nz/OpenTimelineIO that referenced this pull request Apr 19, 2020
* master: (23 commits)
  Indicate Empty track in otioview and display track name (AcademySoftwareFoundation#677)
  FCP 7 XML - Fix failure on empty name tags (AcademySoftwareFoundation#674)
  xges: Effects and Markers Support (AcademySoftwareFoundation#609)
  Add List of Supported Formats to Conform.py Help Text (AcademySoftwareFoundation#676)
  Update Copyright/License on ffmpeg_burnins.py (AcademySoftwareFoundation#679)
  Fix the windows build (AcademySoftwareFoundation#669)
  Version bump to beta 13
  Set final version for beta 12.0 (AcademySoftwareFoundation#665)
  Rodeofx fix cmx 3600 multiple markers per clip issue 593 (AcademySoftwareFoundation#664)
  Tweaks to cmake so that pip and local builds both work (AcademySoftwareFoundation#663)
  Fixed issue where CMX3600 adapter would try to add the same clip to multiple tracks. Also moved some code out of a loop it didn't need to be in. (AcademySoftwareFoundation#644)
  RV adapter metadata updates (AcademySoftwareFoundation#640)
  Expose json indent to the otio_json adapter (AcademySoftwareFoundation#641)
  fix otioconvert for Kdenlive with python3 (AcademySoftwareFoundation#646)
  Add basic debugging instructions to quickstart. (AcademySoftwareFoundation#655)
  Add kdenlive adapter to adapters list. (AcademySoftwareFoundation#661)
  Timecode rate is ignored (AcademySoftwareFoundation#612)
  Detect if plugin doesn't have a docstring and return an error which says which plugin it is that doesn't have the docstring. (AcademySoftwareFoundation#635)
  Add hook function args to otioview and otioconvert (AcademySoftwareFoundation#651)
  Updating Copyright notices (AcademySoftwareFoundation#660)
  ...

# Conflicts:
#	contrib/opentimelineio_contrib/adapters/advanced_authoring_format.py
#	src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EDL cmx 9600 tries to add the same clip to multiple tracks
4 participants