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

FrameMapper/KeyFrame/Point: std:: prefixes

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2019-08-04 22:54:06 -04:00
parent f927cc0c3c
commit 3879b09047
6 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/FrameMapper.cpp
View File

@@ -675,7 +675,7 @@ void FrameMapper::Close()
// Generate JSON string of this object
string FrameMapper::Json() {
std::string FrameMapper::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -693,14 +693,14 @@ Json::Value FrameMapper::JsonValue() {
}
// Load JSON string into this object
void FrameMapper::SetJson(string value) {
void FrameMapper::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;
@@ -820,7 +820,7 @@ void FrameMapper::ResampleMappedAudio(std::shared_ptr<Frame> frame, int64_t orig
if (error_code < 0)
{
ZmqLogger::Instance()->AppendDebugMethod("FrameMapper::ResampleMappedAudio ERROR [" + (string)av_err2str(error_code) + "]", "error_code", error_code);
ZmqLogger::Instance()->AppendDebugMethod("FrameMapper::ResampleMappedAudio ERROR [" + (std::string)av_err2str(error_code) + "]", "error_code", error_code);
throw ErrorEncodingVideo("Error while resampling audio in frame mapper", frame->number);
}