@@ -53,24 +53,24 @@ namespace openshot {
5353 class CacheDisk : public CacheBase {
5454 private:
5555 QDir path; // /< This is the folder path of the cache directory
56- map<int64_t , int64_t > frames; // /< This map holds the frame number and Frame objects
57- deque<int64_t > frame_numbers; // /< This queue holds a sequential list of cached Frame numbers
58- string image_format;
56+ std:: map<int64_t , int64_t > frames; // /< This map holds the frame number and Frame objects
57+ std:: deque<int64_t > frame_numbers; // /< This queue holds a sequential list of cached Frame numbers
58+ std:: string image_format;
5959 float image_quality;
6060 float image_scale;
6161
6262 int64_t frame_size_bytes; // /< The size of the cached frame in bytes
6363 bool needs_range_processing; // /< Something has changed, and the range data needs to be re-calculated
64- string json_ranges; // /< JSON ranges of frame numbers
65- vector<int64_t > ordered_frame_numbers; // /< Ordered list of frame numbers used by cache
66- map<int64_t , int64_t > frame_ranges; // /< This map holds the ranges of frames, useful for quickly displaying the contents of the cache
64+ std:: string json_ranges; // /< JSON ranges of frame numbers
65+ std:: vector<int64_t > ordered_frame_numbers; // /< Ordered list of frame numbers used by cache
66+ std:: map<int64_t , int64_t > frame_ranges; // /< This map holds the ranges of frames, useful for quickly displaying the contents of the cache
6767 int64_t range_version; // /< The version of the JSON range data (incremented with each change)
6868
6969 // / Clean up cached frames that exceed the max number of bytes
7070 void CleanUp ();
7171
7272 // / Init path directory
73- void InitPath (string cache_path);
73+ void InitPath (std:: string cache_path);
7474
7575 // / Calculate ranges of frames
7676 void CalculateRanges ();
@@ -81,22 +81,22 @@ namespace openshot {
8181 // / @param format The image format for disk caching (ppm, jpg, png)
8282 // / @param quality The quality of the image (1.0=highest quality/slowest speed, 0.0=worst quality/fastest speed)
8383 // / @param scale The scale factor for the preview images (1.0 = original size, 0.5=half size, 0.25=quarter size, etc...)
84- CacheDisk (string cache_path, string format, float quality, float scale);
84+ CacheDisk (std:: string cache_path, std:: string format, float quality, float scale);
8585
8686 // / @brief Constructor that sets the max bytes to cache
8787 // / @param cache_path The folder path of the cache directory (empty string = /tmp/preview-cache/)
8888 // / @param format The image format for disk caching (ppm, jpg, png)
8989 // / @param quality The quality of the image (1.0=highest quality/slowest speed, 0.0=worst quality/fastest speed)
9090 // / @param scale The scale factor for the preview images (1.0 = original size, 0.5=half size, 0.25=quarter size, etc...)
9191 // / @param max_bytes The maximum bytes to allow in the cache. Once exceeded, the cache will purge the oldest frames.
92- CacheDisk (string cache_path, string format, float quality, float scale, int64_t max_bytes);
92+ CacheDisk (std:: string cache_path, std:: string format, float quality, float scale, int64_t max_bytes);
9393
9494 // Default destructor
9595 ~CacheDisk ();
9696
9797 // / @brief Add a Frame to the cache
9898 // / @param frame The openshot::Frame object needing to be cached.
99- void Add (std::shared_ptr<Frame> frame);
99+ void Add (std::shared_ptr<openshot:: Frame> frame);
100100
101101 // / Clear the cache of all frames
102102 void Clear ();
@@ -106,13 +106,13 @@ namespace openshot {
106106
107107 // / @brief Get a frame from the cache
108108 // / @param frame_number The frame number of the cached frame
109- std::shared_ptr<Frame> GetFrame (int64_t frame_number);
109+ std::shared_ptr<openshot:: Frame> GetFrame (int64_t frame_number);
110110
111111 // / Gets the maximum bytes value
112112 int64_t GetBytes ();
113113
114114 // / Get the smallest frame number
115- std::shared_ptr<Frame> GetSmallestFrame ();
115+ std::shared_ptr<openshot:: Frame> GetSmallestFrame ();
116116
117117 // / @brief Move frame to front of queue (so it lasts longer)
118118 // / @param frame_number The frame number of the cached frame
@@ -128,8 +128,8 @@ namespace openshot {
128128 void Remove (int64_t start_frame_number, int64_t end_frame_number);
129129
130130 // / Get and Set JSON methods
131- string Json (); // /< Generate JSON string of this object
132- void SetJson (string value); // /< Load JSON string into this object
131+ std:: string Json (); // /< Generate JSON string of this object
132+ void SetJson (std:: string value); // /< Load JSON string into this object
133133 Json::Value JsonValue (); // /< Generate Json::JsonValue for this object
134134 void SetJsonValue (Json::Value root); // /< Load Json::JsonValue into this object
135135 };
0 commit comments