work on internal color management
This commit is contained in:
+13
-5
@@ -34,11 +34,12 @@
|
||||
#include "dialog/about/about.h"
|
||||
#include "dialog/sequence/sequence.h"
|
||||
#include "dialog/preferences/preferences.h"
|
||||
#include "dialog/projectproperties/projectproperties.h"
|
||||
#include "panel/panelmanager.h"
|
||||
#include "panel/project/project.h"
|
||||
#include "project/item/footage/footage.h"
|
||||
#include "project/item/sequence/sequence.h"
|
||||
#include "render/colorservice.h"
|
||||
#include "render/colormanager.h"
|
||||
#include "task/import/import.h"
|
||||
#include "task/taskmanager.h"
|
||||
#include "ui/style/style.h"
|
||||
@@ -92,6 +93,9 @@ void Core::Start()
|
||||
// Load application config
|
||||
Config::Load();
|
||||
|
||||
// Set up color manager
|
||||
ColorManager::CreateInstance();
|
||||
|
||||
|
||||
//
|
||||
// Start GUI (FIXME CLI mode)
|
||||
@@ -108,6 +112,8 @@ void Core::Stop()
|
||||
{
|
||||
AudioManager::DestroyInstance();
|
||||
|
||||
ColorManager::DestroyInstance();
|
||||
|
||||
delete main_window_;
|
||||
}
|
||||
|
||||
@@ -208,6 +214,12 @@ void Core::DialogPreferencesShow()
|
||||
pd.exec();
|
||||
}
|
||||
|
||||
void Core::DialogProjectPropertiesShow()
|
||||
{
|
||||
ProjectPropertiesDialog ppd(main_window_);
|
||||
ppd.exec();
|
||||
}
|
||||
|
||||
void Core::CreateNewFolder()
|
||||
{
|
||||
// Locate the most recently focused Project panel (assume that's the panel the user wants to import into)
|
||||
@@ -334,12 +346,8 @@ void Core::StartGUI(bool full_screen)
|
||||
// When a new project is opened, update the mainwindow
|
||||
connect(this, SIGNAL(ProjectOpened(Project*)), main_window_, SLOT(ProjectOpen(Project*)));
|
||||
|
||||
// Initialize color service
|
||||
ColorService::Init();
|
||||
|
||||
// Initialize audio service
|
||||
AudioManager::CreateInstance();
|
||||
|
||||
}
|
||||
|
||||
Project *Core::GetActiveProject()
|
||||
|
||||
Reference in New Issue
Block a user