openshot:develop

Last commit made on 2022-07-20
Get this branch:
git clone -b develop https://git.launchpad.net/openshot
Members of OpenShot Code can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
develop
Repository:
lp:openshot

Recent commits

d5a485b... by JacksonRG <email address hidden>

Merge pull request #4859 from OpenShot/improved-waveforms_Mk3

Improved waveforms mk3

f6b5fd0... by Jackson Godwin

Cleanup

- Used auto-format to fix some spacing issues throughout the PR.

79deecb... by Jackson Godwin

Cleanup

- Remove reference to setAudioData (Removed function)
- Change volume action to use new waveform method calls.
- Removing unnecessary imports
- Remove -999 Placeholcer. Causes undo problems.
- Remove waveform calls from clip slicing
- Add waveform to clips when split

ef4fe3c... by Jackson Godwin

Refactor Waveform Display

- Show a waveform if audio data is present
    - Otherwise default to the clip's thumbnail.
- (Credit to Jonathan Thomas for the javascript)

47921c6... by Jackson Godwin

Refactor Waveform Calculation

- Only retrieve audio data once for a file
- Return to thumbnail by removing audio data
- Create an action to clear audio data from a project.

08d4a68... by JacksonRG <email address hidden>

Merge pull request #4848 from OpenShot/export-clips-100%-on-complete

When all clips are exported set progress to 100%

912c120... by Jackson Godwin

When all clips are exported set progress to 100%

3fe6e21... by JacksonRG <email address hidden>

Merge pull request #4821 from OpenShot/end-blender-process-on-cancel

End blender render process when cancel button is pressed.

919aac0... by JacksonRG <email address hidden>

Merge pull request #4843 from OpenShot/revert-4819-improved-waveforms

Revert "Improved Waveforms (highly optimized)"

7dc5a5c... by JacksonRG <email address hidden>

Revert "Improved Waveforms (highly optimized)"