(include/src)/effects/: std::prefixes

This commit is contained in:
FeRD (Frank Dana)
2019-08-05 01:08:03 -04:00
parent 352fd6629a
commit 45cfda413d
28 changed files with 101 additions and 129 deletions

View File

@@ -41,8 +41,6 @@
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -91,14 +89,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -49,8 +49,6 @@
#include "../QtImageReader.h"
#include "../ChunkReader.h"
using namespace std;
namespace openshot
{
@@ -104,14 +102,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -48,8 +48,6 @@
#include "../QtImageReader.h"
#include "../ChunkReader.h"
using namespace std;
namespace openshot
{
@@ -91,14 +89,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -43,8 +43,6 @@
#include "../Exceptions.h"
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -88,13 +86,13 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
// Get all properties for a specific frame
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -40,8 +40,6 @@
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -95,14 +93,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -41,8 +41,6 @@
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -90,14 +88,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -44,8 +44,6 @@
#include "../Json.h"
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -84,13 +82,13 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
// Get all properties for a specific frame
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -40,8 +40,6 @@
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -81,14 +79,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -52,8 +52,6 @@
#include "../ImageReader.h"
#endif
using namespace std;
namespace openshot
{
@@ -103,14 +101,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
/// Get the reader object of the mask grayscale image
ReaderBase* Reader() { return reader; };

View File

@@ -43,8 +43,6 @@
#include "../Exceptions.h"
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -72,13 +70,13 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
// Get all properties for a specific frame
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -41,8 +41,6 @@
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -90,14 +88,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -48,8 +48,6 @@
#include "../QtImageReader.h"
#include "../ChunkReader.h"
using namespace std;
namespace openshot
{
@@ -88,14 +86,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -40,8 +40,6 @@
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -84,14 +82,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -40,8 +40,6 @@
#include "../KeyFrame.h"
using namespace std;
namespace openshot
{
@@ -90,14 +88,14 @@ namespace openshot
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
std::string Json(); ///< Generate JSON string of this object
void SetJson(std::string value); ///< Load JSON string into this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
string PropertiesJSON(int64_t requested_frame);
std::string PropertiesJSON(int64_t requested_frame);
};
}

View File

@@ -114,7 +114,7 @@ std::shared_ptr<Frame> Bars::GetFrame(std::shared_ptr<Frame> frame, int64_t fram
}
// Generate JSON string of this object
string Bars::Json() {
std::string Bars::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -137,14 +137,14 @@ Json::Value Bars::JsonValue() {
}
// Load JSON string into this object
void Bars::SetJson(string value) {
void Bars::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;
@@ -185,7 +185,7 @@ void Bars::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
string Bars::PropertiesJSON(int64_t requested_frame) {
std::string Bars::PropertiesJSON(int64_t requested_frame) {
// Generate JSON properties list
Json::Value root;

View File

@@ -252,7 +252,7 @@ void Blur::boxBlurT(unsigned char *scl, unsigned char *tcl, int w, int h, int r)
}
// Generate JSON string of this object
string Blur::Json() {
std::string Blur::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -274,14 +274,14 @@ Json::Value Blur::JsonValue() {
}
// Load JSON string into this object
void Blur::SetJson(string value) {
void Blur::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;
@@ -320,7 +320,7 @@ void Blur::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
string Blur::PropertiesJSON(int64_t requested_frame) {
std::string Blur::PropertiesJSON(int64_t requested_frame) {
// Generate JSON properties list
Json::Value root;

View File

@@ -108,7 +108,7 @@ std::shared_ptr<Frame> Brightness::GetFrame(std::shared_ptr<Frame> frame, int64_
}
// Generate JSON string of this object
string Brightness::Json() {
std::string Brightness::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -128,14 +128,14 @@ Json::Value Brightness::JsonValue() {
}
// Load JSON string into this object
void Brightness::SetJson(string value) {
void Brightness::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;
@@ -170,7 +170,7 @@ void Brightness::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
string Brightness::PropertiesJSON(int64_t requested_frame) {
std::string Brightness::PropertiesJSON(int64_t requested_frame) {
// Generate JSON properties list
Json::Value root;

View File

@@ -101,7 +101,7 @@ std::shared_ptr<Frame> ChromaKey::GetFrame(std::shared_ptr<Frame> frame, int64_t
}
// Generate JSON string of this object
string ChromaKey::Json() {
std::string ChromaKey::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -121,14 +121,14 @@ Json::Value ChromaKey::JsonValue() {
}
// Load JSON string into this object
void ChromaKey::SetJson(string value) {
void ChromaKey::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;
@@ -163,7 +163,7 @@ void ChromaKey::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
string ChromaKey::PropertiesJSON(int64_t requested_frame) {
std::string ChromaKey::PropertiesJSON(int64_t requested_frame) {
// Generate JSON properties list
Json::Value root;

View File

@@ -194,7 +194,7 @@ std::shared_ptr<Frame> ColorShift::GetFrame(std::shared_ptr<Frame> frame, int64_
}
// Generate JSON string of this object
string ColorShift::Json() {
std::string ColorShift::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -220,14 +220,14 @@ Json::Value ColorShift::JsonValue() {
}
// Load JSON string into this object
void ColorShift::SetJson(string value) {
void ColorShift::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;
@@ -274,7 +274,7 @@ void ColorShift::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
string ColorShift::PropertiesJSON(int64_t requested_frame) {
std::string ColorShift::PropertiesJSON(int64_t requested_frame) {
// Generate JSON properties list
Json::Value root;

View File

@@ -114,7 +114,7 @@ std::shared_ptr<Frame> Crop::GetFrame(std::shared_ptr<Frame> frame, int64_t fram
}
// Generate JSON string of this object
string Crop::Json() {
std::string Crop::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -136,14 +136,14 @@ Json::Value Crop::JsonValue() {
}
// Load JSON string into this object
void Crop::SetJson(string value) {
void Crop::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;
@@ -182,7 +182,7 @@ void Crop::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
string Crop::PropertiesJSON(int64_t requested_frame) {
std::string Crop::PropertiesJSON(int64_t requested_frame) {
// Generate JSON properties list
Json::Value root;

Some files were not shown because too many files have changed in this diff Show More