openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up timeline class a bit, and refactored some OpenMP multi-threading support. The timeline GetFrame() method can not fully support OpenMP at the moment, due to nested parallel regions in some conditional ImageMagick function calls. Also better protected the openshot::Clip.GetFrame() call.

Browse Source
This commit is contained in:
Jonathan Thomas
2015-03-15 02:28:28 -05:00
parent b07936e3b2
commit 88e65fecef
5 changed files with 157 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/Timeline.h
View File

@@ -162,7 +162,7 @@ namespace openshot {
/// @param requested_frame The frame number that is requested.
/// @param number_of_frames The number of frames to check
/// @param include Include or Exclude intersecting clips
list<Clip*> find_intersecting_clips(int requested_frame, int number_of_frames, bool include);
vector<Clip*> find_intersecting_clips(int requested_frame, int number_of_frames, bool include);
/// Apply effects to the source frame (if any)
tr1::shared_ptr<Frame> apply_effects(tr1::shared_ptr<Frame> frame, int timeline_frame_number, int layer);
@@ -177,10 +177,7 @@ namespace openshot {
void sort_effects();
/// Update the list of 'opened' clips
void update_open_clips(Clip *clip, bool is_open);
/// Update the list of 'closed' clips
void update_closed_clips();
void update_open_clips(Clip *clip, bool does_clip_intersect);
public: