Centralize legacy app startup
This commit is contained in:
35
src/app.cpp
35
src/app.cpp
@@ -6,10 +6,12 @@
|
||||
#include "node_progress_bar.h"
|
||||
#include "mp4enc.h"
|
||||
#include "app_core/app_status.h"
|
||||
#include "app_core/app_startup.h"
|
||||
#include "app_core/canvas_tool_ui.h"
|
||||
#include "app_core/document_recording.h"
|
||||
#include "app_core/document_route.h"
|
||||
#include "app_core/document_session.h"
|
||||
#include "legacy_app_startup_services.h"
|
||||
#include "legacy_document_open_services.h"
|
||||
#include "legacy_document_session_services.h"
|
||||
#include "legacy_recording_services.h"
|
||||
@@ -436,12 +438,20 @@ void App::init()
|
||||
LOG("OpenGL startup state failed: %s", startup_state_status.message);
|
||||
});
|
||||
|
||||
int run_counter = Settings::value<Serializer::Integer>("run_counter") + 1;
|
||||
Settings::set("run_counter", Serializer::Integer(run_counter));
|
||||
LOG("run_counter %d", run_counter);
|
||||
|
||||
if (!Settings::save())
|
||||
LOG("save preferences failed");
|
||||
const auto startup_plan = pp::app::plan_app_startup(
|
||||
Settings::value<Serializer::Integer>("run_counter"),
|
||||
Settings::value_or<Serializer::Boolean>("auto-timelapse", true),
|
||||
Settings::value_or<Serializer::Boolean>("vr-controllers-enabled", vr_controllers_enabled),
|
||||
check_license());
|
||||
if (!startup_plan) {
|
||||
LOG("App startup plan failed: %s", startup_plan.status().message);
|
||||
} else {
|
||||
const auto persistence_status = pp::panopainter::execute_legacy_app_startup_persistence_plan(
|
||||
*this,
|
||||
startup_plan.value());
|
||||
if (!persistence_status.ok())
|
||||
LOG("App startup persistence failed: %s", persistence_status.message);
|
||||
}
|
||||
|
||||
initShaders();
|
||||
initAssets();
|
||||
@@ -450,13 +460,12 @@ void App::init()
|
||||
|
||||
uirtt.create(width, height, -1, rgba8_internal_format(), true);
|
||||
|
||||
if (Settings::value_or<Serializer::Boolean>("auto-timelapse", true))
|
||||
rec_start();
|
||||
Settings::value<Serializer::Boolean>("vr-controllers-enabled", vr_controllers_enabled);
|
||||
|
||||
if (!check_license())
|
||||
{
|
||||
message_box("License", "Could not validate this license, running in demo mode.");
|
||||
if (startup_plan) {
|
||||
const auto startup_status = pp::panopainter::execute_legacy_app_startup_runtime_plan(
|
||||
*this,
|
||||
startup_plan.value());
|
||||
if (!startup_status.ok())
|
||||
LOG("App startup runtime execution failed: %s", startup_status.message);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user