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

std:: prefixes for CacheBase/Disk/Memory

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2019-08-04 22:34:24 -04:00
parent 0b6f9ff5bd
commit b6b832fb81
6 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/CacheMemory.cpp
View File

@@ -79,7 +79,7 @@ void CacheMemory::CalculateRanges() {
// Increment range version
range_version++;
vector<int64_t>::iterator itr_ordered;
std::vector<int64_t>::iterator itr_ordered;
int64_t starting_frame = *ordered_frame_numbers.begin();
int64_t ending_frame = *ordered_frame_numbers.begin();
@@ -92,9 +92,9 @@ void CacheMemory::CalculateRanges() {
// Add JSON object with start/end attributes
// Use strings, since int64_ts are supported in JSON
stringstream start_str;
std::stringstream start_str;
start_str << starting_frame;
stringstream end_str;
std::stringstream end_str;
end_str << ending_frame;
range["start"] = start_str.str();
range["end"] = end_str.str();
@@ -113,9 +113,9 @@ void CacheMemory::CalculateRanges() {
// Add JSON object with start/end attributes
// Use strings, since int64_ts are not supported in JSON
stringstream start_str;
std::stringstream start_str;
start_str << starting_frame;
stringstream end_str;
std::stringstream end_str;
end_str << ending_frame;
range["start"] = start_str.str();
range["end"] = end_str.str();
@@ -178,7 +178,7 @@ std::shared_ptr<Frame> CacheMemory::GetSmallestFrame()
std::shared_ptr<openshot::Frame> f;
// Loop through frame numbers
deque<int64_t>::iterator itr;
std::deque<int64_t>::iterator itr;
int64_t smallest_frame = -1;
for(itr = frame_numbers.begin(); itr != frame_numbers.end(); ++itr)
{
@@ -201,7 +201,7 @@ int64_t CacheMemory::GetBytes()
int64_t total_bytes = 0;
// Loop through frames, and calculate total bytes
deque<int64_t>::reverse_iterator itr;
std::deque<int64_t>::reverse_iterator itr;
for(itr = frame_numbers.rbegin(); itr != frame_numbers.rend(); ++itr)
{
total_bytes += frames[*itr]->GetBytes();
@@ -223,7 +223,7 @@ void CacheMemory::Remove(int64_t start_frame_number, int64_t end_frame_number)
const GenericScopedLock<CriticalSection> lock(*cacheCriticalSection);
// Loop through frame numbers
deque<int64_t>::iterator itr;
std::deque<int64_t>::iterator itr;
for(itr = frame_numbers.begin(); itr != frame_numbers.end();)
{
if (*itr >= start_frame_number && *itr <= end_frame_number)
@@ -235,7 +235,7 @@ void CacheMemory::Remove(int64_t start_frame_number, int64_t end_frame_number)
}
// Loop through ordered frame numbers
vector<int64_t>::iterator itr_ordered;
std::vector<int64_t>::iterator itr_ordered;
for(itr_ordered = ordered_frame_numbers.begin(); itr_ordered != ordered_frame_numbers.end();)
{
if (*itr_ordered >= start_frame_number && *itr_ordered <= end_frame_number)
@@ -261,7 +261,7 @@ void CacheMemory::MoveToFront(int64_t frame_number)
if (frames.count(frame_number))
{
// Loop through frame numbers
deque<int64_t>::iterator itr;
std::deque<int64_t>::iterator itr;
for(itr = frame_numbers.begin(); itr != frame_numbers.end(); ++itr)
{
if (*itr == frame_number)
@@ -321,7 +321,7 @@ void CacheMemory::CleanUp()
// Generate JSON string of this object
string CacheMemory::Json() {
std::string CacheMemory::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -337,7 +337,7 @@ Json::Value CacheMemory::JsonValue() {
Json::Value root = CacheBase::JsonValue(); // get parent properties
root["type"] = cache_type;
stringstream range_version_str;
std::stringstream range_version_str;
range_version_str << range_version;
root["version"] = range_version_str.str();
@@ -346,7 +346,7 @@ Json::Value CacheMemory::JsonValue() {
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
string errors;
std::string errors;
bool success = reader->parse( json_ranges.c_str(),
json_ranges.c_str() + json_ranges.size(), &ranges, &errors );
delete reader;
@@ -359,14 +359,14 @@ Json::Value CacheMemory::JsonValue() {
}
// Load JSON string into this object
void CacheMemory::SetJson(string value) {
void CacheMemory::SetJson(std::string value) {
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
string errors;
std::string errors;
bool success = reader->parse( value.c_str(),
value.c_str() + value.size(), &root, &errors );
delete reader;