Merge lp://qastaging/~jderose/novacut/audio into lp://qastaging/novacut
Status: | Merged |
---|---|
Approved by: | James Raymond |
Approved revision: | 145 |
Merged at revision: | 133 |
Proposed branch: | lp://qastaging/~jderose/novacut/audio |
Merge into: | lp://qastaging/novacut |
Diff against target: |
655 lines (+243/-230) 7 files modified
gen-random-project.py (+4/-2) novacut-gtk (+7/-5) novacut/views.py (+4/-60) novacut2/builder.py (+0/-80) novacut2/renderer.py (+78/-30) novacut2/tests/test_renderer.py (+148/-53) novacut2/worker.py (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~jderose/novacut/audio |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Raymond | Approve | ||
Review via email:
|
Description of the change
the builder functions now have this call signature:
build_func(builder, doc, offset=0)
And these fuctions now add elements to the gnlcomposition themselves, and returns a durtation for this node, or at least the duration that should be added the offset to compute the offset the next node in the sequence will use.
Importantly, this API change allows the builder functions to add multiple slices to the composition. This is needed for popper audio support and for any of the composite node-types we'll eventually have.
I also wrongly thought you could put both audio and video slices in the same gnlcompositon, but that's no the case. So now the Builder has one composition for audio, one for video.