oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various: encapsulate all code in the olive namespace to avoid name collisions

Browse Source 
Large-scale code cleanup. Also adds a license to the top of all files that were
missing it.
This commit is contained in:
itsmattkc
2020-04-06 15:29:53 +10:00
parent 82b6ddccc8
commit 1aa87cbda6
519 changed files with 7939 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/autoscroll.h
+26
View File
@@ -1,6 +1,30 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef AUTOSCROLL_H
#define AUTOSCROLL_H
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class AutoScroll {
public:
enum Method {
@@ -10,4 +34,6 @@ public:
};
};
OLIVE_NAMESPACE_EXIT
#endif // AUTOSCROLL_H
app/common/bezier.cpp
+24
View File
@@ -1,7 +1,29 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "bezier.h"
#include <QtMath>
OLIVE_NAMESPACE_ENTER
double Bezier::QuadraticXtoT(double x, double a, double b, double c)
{
return (a - b + qSqrt(a*x + c*x - 2*b*x + qPow(b, 2) - a*c))/(a - 2*b + c);
@@ -40,3 +62,5 @@ double Bezier::CubicTtoY(double a, double b, double c, double d, double t)
{
return qPow(1.0 - t, 3)*a + 3*qPow(1.0 - t, 2)*t*b + 3*(1.0 - t)*qPow(t, 2)*c + qPow(t, 3)*d;
}
OLIVE_NAMESPACE_EXIT
app/common/bezier.h
+25
View File
@@ -1,6 +1,29 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef BEZIER_H
#define BEZIER_H
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class Bezier
{
@@ -14,4 +37,6 @@ public:
static double CubicTtoY(double a, double b, double c, double d, double t);
};
OLIVE_NAMESPACE_EXIT
#endif // BEZIER_H
app/common/cancelableobject.h
+26
View File
@@ -1,8 +1,32 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef CANCELABLEOBJECT_H
#define CANCELABLEOBJECT_H
#include <QAtomicInt>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class CancelableObject {
public:
CancelableObject() :
@@ -23,4 +47,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // CANCELABLEOBJECT_H
app/common/constructors.h
+26
View File
@@ -1,6 +1,30 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef CONSTRUCTORS_H
#define CONSTRUCTORS_H
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* Copy/move deleters. Similar to Q_DISABLE_COPY_MOVE, et al. but those functions are not present in Qt < 5.13 so we
* use our own functions for portability.
@@ -18,4 +42,6 @@
DISABLE_COPY(Class) \
DISABLE_MOVE(Class)
OLIVE_NAMESPACE_EXIT
#endif // CONSTRUCTORS_H
app/common/crashhandler.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "crashhandler.h"
#include <QApplication>
@@ -17,6 +37,8 @@
#include <execinfo.h>
#endif
OLIVE_NAMESPACE_ENTER
void crash_handler(int sig) {
QString log_path = QDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation)).filePath(QStringLiteral("olive_crash"));
QFile output(log_path);
@@ -118,3 +140,5 @@ void crash_handler(int sig) {
exit(1);
}
OLIVE_NAMESPACE_EXIT
app/common/crashhandler.h
+26
View File
@@ -1,6 +1,32 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef CRASHHANDLER_H
#define CRASHHANDLER_H
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
void crash_handler(int sig);
OLIVE_NAMESPACE_EXIT
#endif // CRASHHANDLER_H
app/common/debug.cpp
+23
View File
@@ -1,5 +1,26 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "debug.h"
OLIVE_NAMESPACE_ENTER
void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
@@ -32,3 +53,5 @@ void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QStri
fflush(stderr);
#endif
}
OLIVE_NAMESPACE_EXIT
app/common/debug.h
+26
View File
@@ -1,8 +1,34 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef DEBUG_H
#define DEBUG_H
#include <QDebug>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
OLIVE_NAMESPACE_EXIT
#endif // DEBUG_H
app/common/define.h
+13 -2
View File
@@ -21,6 +21,14 @@
#ifndef OLIVECOMMONDEFINE_H
#define OLIVECOMMONDEFINE_H
#define OLIVE_NAMESPACE olive
#define OLIVE_NAMESPACE_ENTER namespace OLIVE_NAMESPACE {
#define OLIVE_NAMESPACE_EXIT }
OLIVE_NAMESPACE_ENTER
const int kHSVChannels = 3;
const int kRGBChannels = 3;
const int kRGBAChannels = 4;
@@ -34,8 +42,11 @@ const int kProjectIconSizeMaximum = 256;
/// The default size an icon in ProjectExplorer can be
const int kProjectIconSizeDefault = 64;
#define OLIVE_NAMESPACE_ENTER namespace olive {
OLIVE_NAMESPACE_EXIT
#define OLIVE_NAMESPACE_EXIT }
#define MACRO_NAME_AS_STR(s) #s
#define MACRO_VAL_AS_STR(s) MACRO_NAME_AS_STR(s)
#define OLIVE_NS_ARG(x, y) QArgument<OLIVE_NAMESPACE::x>(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y)
#endif // OLIVECOMMONDEFINE_H
app/common/filefunctions.cpp
+4
View File
@@ -29,6 +29,8 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
QString GetUniqueFileIdentifier(const QString &filename)
{
QFileInfo info(filename);
@@ -95,3 +97,5 @@ QString GetApplicationPath()
{
return QCoreApplication::applicationDirPath();
}
OLIVE_NAMESPACE_EXIT
app/common/filefunctions.h
+6
View File
@@ -23,6 +23,10 @@
#include <QString>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
bool IsPortable();
QString GetUniqueFileIdentifier(const QString& filename);
@@ -37,4 +41,6 @@ QString GetConfigurationLocation();
QString GetApplicationPath();
OLIVE_NAMESPACE_EXIT
#endif // FILEFUNCTIONS_H
app/common/flipmodifiers.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "flipmodifiers.h"
OLIVE_NAMESPACE_ENTER
Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) {
if (e & Qt::ControlModifier & Qt::ShiftModifier) {
return e;
@@ -35,3 +37,5 @@ Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) {
return e;
}
OLIVE_NAMESPACE_EXIT
app/common/flipmodifiers.h
+6
View File
@@ -23,6 +23,12 @@
#include <QtCore>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e);
OLIVE_NAMESPACE_EXIT
#endif // FLIPMODIFIERS_H
app/common/functiontimer.h
+20
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef FUNCTIONTIMER_H
#define FUNCTIONTIMER_H
app/common/qtutils.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "qtutils.h"
OLIVE_NAMESPACE_ENTER
int QFontMetricsWidth(QFontMetrics fm, const QString& s) {
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
return fm.width(s);
@@ -27,3 +29,5 @@ int QFontMetricsWidth(QFontMetrics fm, const QString& s) {
return fm.horizontalAdvance(s);
#endif
}
OLIVE_NAMESPACE_EXIT
app/common/qtutils.h
+6
View File
@@ -29,6 +29,10 @@
#include <QFontMetrics>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief Retrieves the width of a string according to certain QFontMetrics
*
@@ -37,4 +41,6 @@
*/
int QFontMetricsWidth(QFontMetrics fm, const QString& s);
OLIVE_NAMESPACE_EXIT
#endif // QTVERSIONABSTRACTION_H
app/common/rational.cpp
+13 -8
View File
@@ -3,6 +3,8 @@
#include "rational.h"
OLIVE_NAMESPACE_ENTER
rational::rational(const AVRational &r) :
numer(r.num),
denom(r.den)
@@ -32,7 +34,7 @@ rational rational::fromString(const QString &str)
//Function: print number to cout
void rational::print(ostream &out) const
void rational::print(std::ostream &out) const
{
out << this->numer << "/" << this->denom;
}
@@ -425,7 +427,7 @@ bool rational::operator!() const
//IO
ostream& operator<<(ostream &out, const rational &value)
std::ostream& operator<<(std::ostream &out, const rational &value)
{
out << value.numer;
if(value.denom != 1)
@@ -436,7 +438,7 @@ ostream& operator<<(ostream &out, const rational &value)
return out;
}
istream& operator>>(istream &in, rational &value)
std::istream& operator>>(std::istream &in, rational &value)
{
in >> value.numer;
value.denom = 1;
@@ -458,13 +460,16 @@ istream& operator>>(istream &in, rational &value)
return in;
}
QDebug operator<<(QDebug debug, const rational &r)
uint qHash(const rational &r, uint seed)
{
return ::qHash(r.toDouble(), seed);
}
OLIVE_NAMESPACE_EXIT
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational &r)
{
debug.nospace() << r.numerator() << "/" << r.denominator();
return debug.space();
}
uint qHash(const rational &r, uint seed)
{
return qHash(r.toDouble(), seed);
}
app/common/rational.h
+12 -8
View File
@@ -14,7 +14,9 @@ extern "C" {
#include <libavformat/avformat.h>
}
using namespace std;
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
typedef int64_t intType;
/*
@@ -90,11 +92,11 @@ public:
bool isNull() const;
//Function: print number to cout
void print(ostream &out = cout) const;
void print(std::ostream &out = std::cout) const;
//IO
friend ostream& operator<<(ostream &out, const rational &value);
friend istream& operator>>(istream &in, rational &value);
friend std::ostream& operator<<(std::ostream &out, const rational &value);
friend std::istream& operator>>(std::istream &in, rational &value);
const intType& numerator() const;
const intType& denominator() const;
@@ -116,14 +118,16 @@ private:
intType gcd(intType &x, intType &y);
};
QDebug operator<<(QDebug debug, const rational& r);
// We define these limits at 32-bit to try avoiding integer overflow
#define RATIONAL_MIN rational(INT32_MIN, 1)
#define RATIONAL_MAX rational(INT32_MAX, 1)
Q_DECLARE_METATYPE(rational)
uint qHash(const rational& r, uint seed);
OLIVE_NAMESPACE_EXIT
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational& r);
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::rational)
#endif // RATIONAL_H
app/common/threadedobject.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "threadedobject.h"
OLIVE_NAMESPACE_ENTER
void ThreadedObject::LockDeletes()
{
threadobj_delete_lock_++;
@@ -31,3 +53,5 @@ bool ThreadedObject::TryLockMutex(int timeout)
{
return threadobj_main_lock_.tryLock(timeout);
}
OLIVE_NAMESPACE_EXIT
app/common/threadedobject.h
+26
View File
@@ -1,8 +1,32 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef THREADEDOBJECT_H
#define THREADEDOBJECT_H
#include <QMutex>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class ThreadedObject
{
public:
@@ -21,4 +45,6 @@ private:
QAtomicInt threadobj_delete_lock_;
};
OLIVE_NAMESPACE_EXIT
#endif // THREADEDOBJECT_H
app/common/timecodefunctions.cpp
+4
View File
@@ -24,6 +24,8 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
QString padded(int64_t arg, int padding) {
return QStringLiteral("%1").arg(arg, padding, 10, QChar('0'));
}
@@ -273,3 +275,5 @@ int64_t Timecode::rescale_timestamp_ceil(const int64_t &ts, const rational &sour
{
return qCeil(static_cast<double>(ts) * source.toDouble() / dest.toDouble());
}
OLIVE_NAMESPACE_EXIT
app/common/timecodefunctions.h
+4
View File
@@ -25,6 +25,8 @@
#include "common/rational.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief Functions for converting times/timecodes/timestamps
*
@@ -68,4 +70,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMECODEFUNCTIONS_H
app/common/timelinecommon.h
+26
View File
@@ -1,6 +1,30 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef TIMELINECOMMON_H
#define TIMELINECOMMON_H
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class Timeline {
public:
enum MovementMode {
@@ -21,4 +45,6 @@ public:
static bool IsATrimMode(MovementMode mode) {return mode == kTrimIn || mode == kTrimOut;}
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINECOMMON_H
app/common/timerange.cpp
+29 -5
View File
@@ -1,7 +1,29 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "timerange.h"
#include <utility>
OLIVE_NAMESPACE_ENTER
TimeRange::TimeRange(const rational &in, const rational &out) :
in_(in),
out_(out)
@@ -94,11 +116,6 @@ void TimeRange::normalize()
length_ = out_ - in_;
}
uint qHash(const TimeRange &r, uint seed)
{
return qHash(r.in(), seed) ^ qHash(r.out(), seed);
}
void TimeRangeList::InsertTimeRange(const TimeRange &range)
{
for (int i=0;i<size();i++) {
@@ -177,3 +194,10 @@ TimeRangeList TimeRangeList::Intersects(const TimeRange &range)
return intersect_list;
}
uint qHash(const TimeRange &r, uint seed)
{
return qHash(r.in(), seed) ^ qHash(r.out(), seed);
}
OLIVE_NAMESPACE_EXIT
app/common/timerange.h
+28 -4
View File
@@ -1,8 +1,30 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef TIMERANGE_H
#define TIMERANGE_H
#include "rational.h"
OLIVE_NAMESPACE_ENTER
class TimeRange {
public:
TimeRange() = default;
@@ -34,10 +56,6 @@ private:
};
Q_DECLARE_METATYPE(TimeRange)
uint qHash(const TimeRange& r, uint seed);
class TimeRangeList : public QList<TimeRange> {
public:
TimeRangeList() = default;
@@ -52,4 +70,10 @@ public:
};
uint qHash(const TimeRange& r, uint seed);
OLIVE_NAMESPACE_EXIT
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TimeRange)
#endif // TIMERANGE_H
app/common/xmlutils.cpp
+24
View File
@@ -1,9 +1,31 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "xmlutils.h"
#include "node/block/block.h"
#include "node/factory.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
Node* XMLLoadNode(QXmlStreamReader* reader) {
QString node_id;
quintptr node_ptr = 0;
@@ -74,3 +96,5 @@ void XMLLinkBlocks(const XMLNodeData &xml_node_data)
}
}
}
OLIVE_NAMESPACE_EXIT
app/common/xmlutils.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef XMLREADLOOP_H
#define XMLREADLOOP_H
@@ -6,6 +26,8 @@
#include "project/item/footage/stream.h"
OLIVE_NAMESPACE_ENTER
class Block;
class Node;
class NodeParam;
@@ -48,4 +70,6 @@ bool XMLReadNextStartElement(QXmlStreamReader* reader);
void XMLLinkBlocks(const XMLNodeData& xml_node_data);
OLIVE_NAMESPACE_EXIT
#endif // XMLREADLOOP_H