Code reorganization to enable Dynamic profile with rt-cli (#3691)

This commit is contained in:
Hombre
2017-04-25 00:50:18 +02:00
parent 040065e55f
commit fb5466bc8c
20 changed files with 717 additions and 631 deletions

View File

@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../rtgui/profilestorecombobox.h"
#include "rtengine.h"
#include "iccstore.h"
#include "dcp.h"
@@ -27,7 +28,7 @@
#include "dfmanager.h"
#include "ffmanager.h"
#include "rtthumbnail.h"
#include "../rtgui/profilestore.h"
#include "profilestore.h"
#include "../rtgui/threadutils.h"
namespace rtengine
@@ -40,6 +41,7 @@ MyMutex* lcmsMutex = nullptr;
int init (const Settings* s, Glib::ustring baseDir, Glib::ustring userSettingsDir, bool loadAll)
{
settings = s;
ProfileStore::getInstance()->init (loadAll);
ICCStore::getInstance()->init (s->iccDirectory, Glib::build_filename (baseDir, "iccprofiles"), loadAll);
DCPStore::getInstance()->init (Glib::build_filename (baseDir, "dcpprofiles"), loadAll);