Merge branch 'serializers'

app/core.cpp

@@ -52,6 +52,7 @@
 #include "dialog/preferences/preferences.h"
 #include "node/color/colormanager/colormanager.h"
 #include "node/factory.h"
+#include "node/project/serializer/serializer.h"
 #include "panel/panelmanager.h"
 #include "panel/project/project.h"
 #include "panel/viewer/viewer.h"
@@ -152,6 +153,9 @@ void Core::Start()
   // Initialize ConformManager
   ConformManager::CreateInstance();
 
+  // Initialize project serializers
+  ProjectSerializer::Initialize();
+
   //
   // Start application
   //
@@ -207,6 +211,8 @@ void Core::Stop()
     }
   }
 
+  ProjectSerializer::Destroy();
+
   ConformManager::DestroyInstance();
 
   FrameManager::DestroyInstance();
@@ -507,11 +513,10 @@ bool Core::AddOpenProjectFromTask(Task *task)
 
   if (!load_task->IsCancelled()) {
     Project* project = load_task->GetLoadedProject();
-    MainWindowLayoutInfo layout = load_task->GetLoadedLayout();
 
-    if (ValidateFootageInLoadedProject(project, load_task->GetFilenameProjectWasSavedAs())) {
+    if (ValidateFootageInLoadedProject(project, project->GetSavedURL())) {
       AddOpenProject(project);
-      main_window_->LoadLayout(layout);
+      main_window_->LoadLayout(project->GetLayoutInfo());
 
       return true;
     } else {
@@ -770,6 +775,9 @@ void Core::SaveProjectInternal(Project* project, const QString& override_filenam
   // Create save manager
   Task* psm;
 
+  // Put layout into project
+  project->SetLayoutInfo(main_window_->SaveLayout());
+
   if (project->filename().endsWith(QStringLiteral(".otio"), Qt::CaseInsensitive)) {
 #ifdef USE_OTIO
     psm = new SaveOTIOTask(project);