From 88d1b86d11054a736215965e7fea4295d826db0f Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 22 Jan 2021 17:06:36 +1100 Subject: [PATCH] bumped project version --- app/core.cpp | 2 +- app/project/item/sequence/sequence.cpp | 15 --------------- app/task/project/load/load.cpp | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/app/core.cpp b/app/core.cpp index f9846885c..dda5e0854 100644 --- a/app/core.cpp +++ b/app/core.cpp @@ -71,7 +71,7 @@ namespace olive { Core* Core::instance_ = nullptr; -const uint Core::kProjectVersion = 201122; +const uint Core::kProjectVersion = 210122; Core::Core(const CoreParams& params) : main_window_(nullptr), diff --git a/app/project/item/sequence/sequence.cpp b/app/project/item/sequence/sequence.cpp index ea2f59dc6..d24e741ea 100644 --- a/app/project/item/sequence/sequence.cpp +++ b/app/project/item/sequence/sequence.cpp @@ -132,21 +132,6 @@ void Sequence::Load(QXmlStreamReader *reader, XMLNodeData& xml_node_data, uint v XMLAttributeLoop(reader, attr) { if (attr.name() == QStringLiteral("id")) { QString id = attr.value().toString(); - if (version <= 201003) { - // After version 201003, the video and audio nodes were merged into one media node - if (id == QStringLiteral("org.olivevideoeditor.Olive.audioinput") - || id == QStringLiteral("org.olivevideoeditor.Olive.videoinput")) { - id = QStringLiteral("org.olivevideoeditor.Olive.mediainput"); - } - } - - if (version <= 201118) { - // After version 201118, the orthographic matrix node ID was changed from - // "org.olivevideoeditor.Olive.transform" to "org.olivevideoeditor.Olive.ortho" - if (id == QStringLiteral("org.olivevideoeditor.Olive.transform")) { - id = QStringLiteral("org.olivevideoeditor.Olive.ortho"); - } - } node = NodeFactory::CreateFromID(id); break; diff --git a/app/task/project/load/load.cpp b/app/task/project/load/load.cpp index c83cb1c1a..c09c129ad 100644 --- a/app/task/project/load/load.cpp +++ b/app/task/project/load/load.cpp @@ -52,7 +52,7 @@ bool ProjectLoadTask::Run() // Project is newer than we support SetError(tr("This project is newer than this version of Olive and cannot be opened.")); return false; - } else if (project_version < 201003) { // Change this if we drop support for a project version + } else if (project_version < 210122) { // Change this if we drop support for a project version // Project is older than we support SetError(tr("This project is from a version of Olive that is no longer supported in this version.")); return false;