jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated c++11 compatibility for raii wrappers

Browse Source
This commit is contained in:
Palana 2013-12-16 01:43:19 +01:00
parent 42375302d7
commit 06227327f8
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
obs/obs-wrappers.hpp
View File

@ -29,12 +29,16 @@
template<typename T> class BPtr {
T ptr;
public:
inline BPtr() : ptr(NULL) {}
inline BPtr(T p) : ptr(p) {}
inline ~BPtr() {bfree(ptr);}
BPtr(BPtr const&) = delete;
inline T operator=(T p) {bfree(ptr); ptr = p;}
BPtr &operator=(BPtr const&) = delete;
public:
inline BPtr(T p=nullptr) : ptr(p) {}
inline BPtr(BPtr &&other) : ptr(other.ptr) {other.ptr = nullptr;}
inline ~BPtr() {bfree(ptr);}
inline T operator=(T p) {bfree(ptr); ptr = p; return p;}
inline operator T() {return ptr;}
inline T *operator&() {bfree(ptr); ptr = NULL; return &ptr;}
@ -46,8 +50,15 @@ public:
class ConfigFile {
config_t config;
ConfigFile(ConfigFile const&) = delete;
ConfigFile &operator=(ConfigFile const&) = delete;
public:
inline ConfigFile() : config(NULL) {}
inline ConfigFile(ConfigFile &&other) : config(other.config)
{
other.config = nullptr;
}
inline ~ConfigFile()
{
config_close(config);
@ -83,9 +94,16 @@ public:
class TextLookup {
lookup_t lookup;
TextLookup(TextLookup const&) = delete;
TextLookup &operator=(TextLookup const&) = delete;
public:
inline TextLookup() : lookup(NULL) {}
inline TextLookup(lookup_t lookup) : lookup(lookup) {}
inline TextLookup(lookup_t lookup=nullptr) : lookup(lookup) {}
inline TextLookup(TextLookup &&other) : lookup(other.lookup)
{
other.lookup = nullptr;
}
inline ~TextLookup() {text_lookup_destroy(lookup);}
inline TextLookup& operator=(lookup_t val)
@ -110,6 +128,11 @@ public:
class OBSSource {
obs_source_t source;
OBSSource(OBSSource &&) = delete;
OBSSource(OBSSource const&) = delete;
OBSSource &operator=(OBSSource const&) = delete;
public:
inline OBSSource(obs_source_t source) : source(source) {}
inline ~OBSSource() {obs_source_release(source);}

7
obs/wx-wrappers.hpp
View File

@ -41,6 +41,10 @@ class WXConnector {
wxObject *userData;
wxEvtHandler *eventSink;
WXConnector(WXConnector const&) = delete;
WXConnector &operator=(WXConnector const&) = delete;
public:
inline WXConnector()
: obj (NULL),
@ -110,7 +114,6 @@ public:
wxObjectEventFunction func, wxObject *userData,
wxEvtHandler *eventSink)
{
WXConnector connector(obj, type, func, userData, eventSink);
connectors.push_back(std::move(connector));
connectors.emplace_back(obj, type, func, userData, eventSink);
}
};