diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index 01e3e97d..7d2a0dbc 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -882,7 +882,7 @@ std::shared_ptr FFmpegReader::GetFrame(int64_t requested_frame) { return frame; } else { - // Prevent async calls to the remainder of this code + // Prevent async calls to the remainder of this code const std::lock_guard lock(getFrameMutex); // Check the cache a 2nd time (due to the potential previous lock) diff --git a/src/Qt/VideoCacheThread.cpp b/src/Qt/VideoCacheThread.cpp index febebc5c..4c89f714 100644 --- a/src/Qt/VideoCacheThread.cpp +++ b/src/Qt/VideoCacheThread.cpp @@ -215,10 +215,10 @@ namespace openshot should_pause_cache = false; } - // Always cache frames from the current display position to our maximum (based on the cache size). - // Frames which are already cached are basically free. Only uncached frames have a big CPU cost. - // By always looping through the expected frame range, we can fill-in missing frames caused by a - // fragmented cache object (i.e. the user clicking all over the timeline). + // Always cache frames from the current display position to our maximum (based on the cache size). + // Frames which are already cached are basically free. Only uncached frames have a big CPU cost. + // By always looping through the expected frame range, we can fill-in missing frames caused by a + // fragmented cache object (i.e. the user clicking all over the timeline). int64_t starting_frame = std::min(current_display_frame, timeline_max_frame); int64_t ending_frame = std::min(starting_frame + max_frames_ahead, timeline_max_frame); diff --git a/src/Qt/VideoCacheThread.h b/src/Qt/VideoCacheThread.h index 564c8e26..63f40c36 100644 --- a/src/Qt/VideoCacheThread.h +++ b/src/Qt/VideoCacheThread.h @@ -63,8 +63,8 @@ namespace openshot /// Seek the reader to a particular frame number and optionally start the pre-roll void Seek(int64_t new_position, bool start_preroll); - /// Set Speed (The speed and direction to playback a reader (1=normal, 2=fast, 3=faster, -1=rewind, etc...) - void setSpeed(int new_speed); + /// Set Speed (The speed and direction to playback a reader (1=normal, 2=fast, 3=faster, -1=rewind, etc...) + void setSpeed(int new_speed); /// Stop the audio playback void Stop(); diff --git a/src/Timeline.h b/src/Timeline.h index 1a4bde22..de73e331 100644 --- a/src/Timeline.h +++ b/src/Timeline.h @@ -154,9 +154,9 @@ namespace openshot { std::list clips; /// closing_clips; /// open_clips; /// allocated_clips; /// allocated_clips; /// effects; /// allocated_effects; /// allocated_effects; /// allocated_frame_mappers; ///< all the frame mappers we allocated and must free bool managed_cache; ///< Does this timeline instance manage the cache object @@ -260,12 +260,12 @@ namespace openshot { /// @brief Automatically map all clips to the timeline's framerate and samplerate void AutoMapClips(bool auto_map) { auto_map_clips = auto_map; }; - /// Clear all clips, effects, and frame mappers from timeline (and free memory) - void Clear(); + /// Clear all clips, effects, and frame mappers from timeline (and free memory) + void Clear(); - /// Clear all cache for this timeline instance, including all clips' cache - /// @param deep If True, clear all FrameMappers and nested Readers (QtImageReader, FFmpegReader, etc...) - void ClearAllCache(bool deep=false); + /// Clear all cache for this timeline instance, including all clips' cache + /// @param deep If True, clear all FrameMappers and nested Readers (QtImageReader, FFmpegReader, etc...) + void ClearAllCache(bool deep=false); /// Return a list of clips on the timeline std::list Clips() override { return clips; };