submodule: change core into nomarl folder, and move KDockWidgets into third_party.

This commit is contained in:
2026-07-14 15:14:29 +08:00
parent e37a87be67
commit 5c8ce17c7e
41 changed files with 14119 additions and 34 deletions
+109
View File
@@ -0,0 +1,109 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2023 Olive Studios LLC
Modifications Copyright (C) 2025 mikesolar
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 <cstring>
#include "util/rational.h"
#include "util/tests.h"
using namespace olive::core;
bool rational_to_from_string_test()
{
rational r(1, 30);
std::string s = r.toString();
rational r2 = rational::fromString(s);
return r == r2;
}
bool rational_to_from_string_test2()
{
rational r(69, 420);
std::string s = r.toString();
rational r2 = rational::fromString(s);
return r == r2;
}
bool rational_defaults()
{
// By default, rationals are valid 0/1
rational basic_constructor;
if (!basic_constructor.isNull()) {
return false;
}
if (basic_constructor.isNaN()) {
return false;
}
return true;
}
bool rational_nan()
{
// Create a NaN with a 0 denominator
rational nan = rational(0, 0);
if (!nan.isNaN())
return false;
if (!nan.isNull())
return false;
// Create a non-NaN with a zero numerator
rational zero_nonnan(0, 999);
if (!zero_nonnan.isNull())
return false;
if (zero_nonnan.isNaN())
return false;
// Create a non-NaN with a non-zero numerator
rational nonzer_nonnan(1, 30);
if (nonzer_nonnan.isNull())
return false;
if (nonzer_nonnan.isNaN())
return false;
return true;
}
bool rational_nan_constant()
{
return rational::NaN.isNaN();
}
int main()
{
Tester t;
t.add("rational::defaults", rational_defaults);
t.add("rational::NaN", rational_nan);
t.add("rational::NaN_constant", rational_nan_constant);
t.add("rational::toString/fromString", rational_to_from_string_test);
t.add("rational::toString/fromString2", rational_to_from_string_test2);
return t.exec();
}
+47
View File
@@ -0,0 +1,47 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2023 Olive Studios LLC
Modifications Copyright (C) 2025 mikesolar
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 <cstring>
#include "util/stringutils.h"
#include "util/tests.h"
using namespace olive::core;
bool stringutils_format_test()
{
const char *expected = "Hello, world!";
std::string f = StringUtils::format("%s, %s!", "Hello", "world");
if (strcmp(f.c_str(), expected) != 0) {
return false;
}
return true;
}
int main()
{
Tester t;
t.add("StringUtils::format", stringutils_format_test);
return t.exec();
}
+65
View File
@@ -0,0 +1,65 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2023 Olive Studios LLC
Modifications Copyright (C) 2025 mikesolar
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 <cstring>
#include "util/timecodefunctions.h"
#include "util/tests.h"
using namespace olive::core;
bool timecodefunctions_time_to_timecode_test()
{
rational drop_frame_30(1001, 30000);
std::string timecode = Timecode::time_to_timecode(
rational(1), drop_frame_30, Timecode::kTimecodeDropFrame);
if (strcmp(timecode.c_str(), "00:00:01;00") != 0) {
return false;
}
return true;
}
bool timecodefunctions_time_to_timecode_test2()
{
rational bizarre_timebase(156632219);
std::string timecode = Timecode::time_to_timecode(
rational(0), bizarre_timebase, Timecode::kTimecodeDropFrame);
if (strcmp(timecode.c_str(), "INVALID TIMEBASE") != 0) {
return false;
}
return true;
}
int main()
{
Tester t;
t.add("Timecode::time_to_timecode",
timecodefunctions_time_to_timecode_test);
t.add("Timecode::time_to_timecode2",
timecodefunctions_time_to_timecode_test2);
return t.exec();
}
+124
View File
@@ -0,0 +1,124 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2023 Olive Studios LLC
Modifications Copyright (C) 2025 mikesolar
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 <cstring>
#include "util/timerange.h"
#include "util/tests.h"
using namespace olive::core;
bool timerangelist_remove_test()
{
TimeRangeList t;
t.insert(TimeRange(0, 30));
t.remove(TimeRange(2, 5));
return true;
}
bool timerangelist_mergeadjacent_test()
{
TimeRangeList t;
// TimeRangeList should merge 1 and 3 together since they're adjacent
t.insert(TimeRange(0, 6));
t.insert(TimeRange(20, 30));
t.insert(TimeRange(6, 10));
if (!(t.size() == 2)) {
return false;
}
if (!(t.first() == TimeRange(20, 30))) {
return false;
}
if (!(t.at(1) == TimeRange(0, 10))) {
return false;
}
// TimeRangeList should ignore these because it's already contained
TimeRangeList noop_test = t;
noop_test.insert(TimeRange(4, 7));
if (!(noop_test == t)) {
return false;
}
noop_test.insert(TimeRange(0, 3));
if (!(noop_test == t)) {
return false;
}
noop_test.insert(TimeRange(25, 30));
if (!(noop_test == t)) {
return false;
}
// TimeRangeList should combine all these together
TimeRangeList combine_test_no_overlap = t;
combine_test_no_overlap.insert(TimeRange(10, 20));
if (!(combine_test_no_overlap.size() == 1)) {
return false;
}
if (!(combine_test_no_overlap.first() == TimeRange(0, 30))) {
return false;
}
TimeRangeList combine_test_in_overlap = t;
combine_test_in_overlap.insert(TimeRange(9, 20));
if (!(combine_test_in_overlap.size() == 1)) {
return false;
}
if (!(combine_test_in_overlap.first() == TimeRange(0, 30))) {
return false;
}
TimeRangeList combine_test_out_overlap = t;
combine_test_out_overlap.insert(TimeRange(10, 21));
if (!(combine_test_out_overlap.size() == 1)) {
return false;
}
if (!(combine_test_out_overlap.first() == TimeRange(0, 30))) {
return false;
}
TimeRangeList combine_test_both_overlap = t;
combine_test_both_overlap.insert(TimeRange(9, 21));
if (!(combine_test_both_overlap.size() == 1)) {
return false;
}
if (!(combine_test_both_overlap.first() == TimeRange(0, 30))) {
return false;
}
return true;
}
int main()
{
Tester t;
t.add("TimeRangeList::remove", timerangelist_remove_test);
t.add("TimeRangeList::merge_adjacent", timerangelist_mergeadjacent_test);
return t.exec();
}