two step process and configurable colorspaces

This commit is contained in:
itsmattkc
2019-03-20 01:42:40 +11:00
parent 0a5c3fe36e
commit 7d337e6de2
17 changed files with 559 additions and 244 deletions
+2 -1
View File
@@ -299,5 +299,6 @@ void Config::save(QString path) {
}
RuntimeConfig::RuntimeConfig() :
shaders_are_enabled(true)
shaders_are_enabled(true),
ocio_config_date(QDateTime::currentMSecsSinceEpoch())
{}
+30 -1
View File
@@ -519,10 +519,31 @@ struct Config {
/**
* @brief Path to OpenColorIO configuration file
*
* Used if Config::enable_color_management is **TRUE**.
* Used if Config::enable_color_management is true.
*/
QString ocio_config_path;
/**
* @brief OpenColorIO Display
*
* Used if Config::enable_color_management is true
*/
QString ocio_display;
/**
* @brief OpenColorIO View
*
* Used if Config::enable_color_management is true
*/
QString ocio_view;
/**
* @brief OpenColorIO Look
*
* Used if Config::enable_color_management is true
*/
QString ocio_look;
/**
* @brief Style to use when theming Olive.
*
@@ -587,6 +608,14 @@ struct RuntimeConfig {
* Overrides Config::language_file and sets the path to a language file to use.
*/
QString external_translation_file;
/**
* @brief OpenColorIO Configuration Time
*
* A crude but quick way of determining whether the OCIO config has changed and if the rendering threads need to
* re-create their OCIO shaders. Not intended to be saved - could be moved
*/
qint64 ocio_config_date;
};
namespace olive {