Compiler hygiene (all platforms): - Silence warnings across the tree: missing override, -Wreorder ctor init, -Wshadow, -Wsign-compare, missing switch cases, unused functions/captures, Qt 6.11 deprecations (QMouseEvent/QDropEvent accessors, qAsConst, Q_FOREACH over non-shared containers, AA_UseHighDpiPixmaps) and the .bak/ backup tree removal. - Fix regressions from the cleanup: missing clip decls in capi/timeline.cpp, plugin.cpp rename fallout, panel setFocus ambiguity, QGraphicsItem::pos vs event->position(), duplicate k_push_button case, boolean test variable. Windows: - Qt portability: CommandLineParser is_set/add_option, QTimeZone systemTimeZone (QTimeZone::LocalTime is 6.11-only), k_progress_* enum. - Linking: stop adding oakengine to OLIVE_LIBRARIES (import lib plus oakengine-obj caused multiple definitions); add OAKENGINE_STATIC so internal consumers no longer reference __imp_* stubs. - oakengine.ver: export olive::Renderer typeinfo so liboakgl.so can be dlopened (Linux), DynamicRenderer no longer dlcloses backend libraries (crash in RenderManager's dtor calling into unmapped memory). - OTIO runtime: copy DLLs next to every binary on Windows instead of relying on PATH (0xc0000135 in gtest discovery). - Headless GL: the runner only has GDI OpenGL 1.1, killing every render worker. Deploy Mesa llvmpipe as opengl32sw.dll (Qt's software-GL channel) with QT_OPENGL=software, and let QT_OPENGL override the AA_UseDesktopOpenGL default. ExportTask fails fast after 8 consecutive undelivered frames instead of segfaulting or grinding forever; FFmpegEncoder::write_frame tolerates null frames. - Tests: GetTempPathA+PID temp dirs, GetLongPathNameA for 8.3 names, forward-slash normalization when comparing project filenames. Linux: - Install libshaderc-dev so oakvulkan compiles GLSL (Vulkan tests). - Accept UNORM floor-or-round (63/64) in the blit ping-pong test. - Skip MainWindow construction test on the offscreen QPA (cannot paint QOpenGLWidget). Also: oak_cli_transcode gets a 300s ctest timeout, worker logs GL context version and LoadGraph/render_frame stages, and docs/plans/eliminate-event-bridge-issues.md (English translation).
199 lines
5.2 KiB
C++
199 lines
5.2 KiB
C++
/*
|
|
* Oak Video Editor - Non-Linear Video Editor
|
|
* Copyright (C) 2025 Olive CE 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 "serializedlayoutinfo.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
void SerializedLayoutInfo::to_xml(QXmlStreamWriter *writer) const
|
|
{
|
|
writer->writeAttribute(QStringLiteral("version"),
|
|
QString::number(k_version));
|
|
|
|
writer->writeStartElement(QStringLiteral("folders"));
|
|
|
|
for (Folder *folder : open_folders) {
|
|
writer->writeTextElement(
|
|
QStringLiteral("folder"),
|
|
QString::number(reinterpret_cast<quintptr>(folder)));
|
|
}
|
|
|
|
writer->writeEndElement(); // folders
|
|
|
|
writer->writeStartElement(QStringLiteral("timeline"));
|
|
|
|
for (Sequence *sequence : open_sequences) {
|
|
writer->writeTextElement(
|
|
QStringLiteral("sequence"),
|
|
QString::number(reinterpret_cast<quintptr>(sequence)));
|
|
}
|
|
|
|
writer->writeEndElement(); // timeline
|
|
|
|
writer->writeStartElement(QStringLiteral("viewers"));
|
|
|
|
for (ViewerOutput *viewer : open_viewers) {
|
|
writer->writeTextElement(
|
|
QStringLiteral("viewer"),
|
|
QString::number(reinterpret_cast<quintptr>(viewer)));
|
|
}
|
|
|
|
writer->writeEndElement(); // viewers
|
|
|
|
writer->writeStartElement(QStringLiteral("data"));
|
|
|
|
for (auto it = panel_data.cbegin(); it != panel_data.cend(); it++) {
|
|
writer->writeStartElement(QStringLiteral("panel"));
|
|
|
|
writer->writeAttribute(QStringLiteral("id"), it->first);
|
|
|
|
const PanelLayoutInfo &info = it->second;
|
|
for (auto jt = info.cbegin(); jt != info.cend(); jt++) {
|
|
writer->writeStartElement(QStringLiteral("option"));
|
|
|
|
writer->writeAttribute(QStringLiteral("name"), jt->first);
|
|
|
|
writer->writeCharacters(jt->second);
|
|
|
|
writer->writeEndElement(); // option
|
|
}
|
|
|
|
writer->writeEndElement(); // panel
|
|
}
|
|
|
|
writer->writeEndElement(); // data
|
|
|
|
writer->writeTextElement(QStringLiteral("state"),
|
|
QString(state.toBase64()));
|
|
}
|
|
|
|
SerializedLayoutInfo
|
|
SerializedLayoutInfo::from_xml(QXmlStreamReader *reader,
|
|
const QHash<quintptr, Node *> &node_ptrs)
|
|
{
|
|
SerializedLayoutInfo info;
|
|
|
|
unsigned int file_version = 0;
|
|
|
|
XMLAttributeLoop(reader, attr)
|
|
{
|
|
if (attr.name() == QStringLiteral("version")) {
|
|
file_version = attr.value().toUInt();
|
|
}
|
|
}
|
|
|
|
// Really basic version checking, in the future we may use this to parse multiple versions
|
|
if (file_version != k_version) {
|
|
}
|
|
|
|
while (xml_read_next_start_element(reader)) {
|
|
if (reader->name() == QStringLiteral("folders")) {
|
|
while (xml_read_next_start_element(reader)) {
|
|
if (reader->name() == QStringLiteral("folder")) {
|
|
quintptr item_id = reader->readElementText().toULongLong();
|
|
|
|
Folder *open_item =
|
|
static_cast<Folder *>(node_ptrs.value(item_id));
|
|
info.open_folders.push_back(open_item);
|
|
} else {
|
|
reader->skipCurrentElement();
|
|
}
|
|
}
|
|
|
|
} else if (reader->name() == QStringLiteral("timeline")) {
|
|
while (xml_read_next_start_element(reader)) {
|
|
if (reader->name() == QStringLiteral("sequence")) {
|
|
quintptr item_id = reader->readElementText().toULongLong();
|
|
|
|
Sequence *open_seq =
|
|
static_cast<Sequence *>(node_ptrs.value(item_id));
|
|
info.open_sequences.push_back(open_seq);
|
|
} else {
|
|
reader->skipCurrentElement();
|
|
}
|
|
}
|
|
|
|
} else if (reader->name() == QStringLiteral("viewers")) {
|
|
while (xml_read_next_start_element(reader)) {
|
|
if (reader->name() == QStringLiteral("viewer")) {
|
|
quintptr item_id = reader->readElementText().toULongLong();
|
|
|
|
ViewerOutput *open_viewer =
|
|
static_cast<ViewerOutput *>(node_ptrs.value(item_id));
|
|
info.open_viewers.push_back(open_viewer);
|
|
} else {
|
|
reader->skipCurrentElement();
|
|
}
|
|
}
|
|
|
|
} else if (reader->name() == QStringLiteral("state")) {
|
|
info.state =
|
|
QByteArray::fromBase64(reader->readElementText().toLatin1());
|
|
|
|
} else if (reader->name() == QStringLiteral("data")) {
|
|
while (xml_read_next_start_element(reader)) {
|
|
if (reader->name() == QStringLiteral("panel")) {
|
|
QString id;
|
|
XMLAttributeLoop(reader, attr)
|
|
{
|
|
if (attr.name() == QStringLiteral("id")) {
|
|
id = attr.value().toString();
|
|
}
|
|
}
|
|
|
|
if (!id.isEmpty()) {
|
|
PanelLayoutInfo i;
|
|
|
|
while (xml_read_next_start_element(reader)) {
|
|
if (reader->name() == QStringLiteral("option")) {
|
|
QString name;
|
|
|
|
XMLAttributeLoop(reader, attr)
|
|
{
|
|
if (attr.name() == QStringLiteral("name")) {
|
|
name = attr.value().toString();
|
|
}
|
|
}
|
|
|
|
if (!name.isEmpty()) {
|
|
i[name] = reader->readElementText();
|
|
}
|
|
} else {
|
|
reader->skipCurrentElement();
|
|
}
|
|
}
|
|
|
|
info.panel_data[id] = i;
|
|
}
|
|
|
|
} else {
|
|
reader->skipCurrentElement();
|
|
}
|
|
}
|
|
|
|
} else {
|
|
reader->skipCurrentElement();
|
|
}
|
|
}
|
|
|
|
return info;
|
|
}
|
|
|
|
}
|