Solving issue 1684: "thumbnail.cc uses Glib::Mutex recusively" ; this changeset introduce a new MyMutex and MyMutex::MyLock class that has to be used instead of Glib ones

This commit is contained in:
Hombre
2013-08-11 23:33:10 +02:00
parent 987e4dcd89
commit f512d74323
55 changed files with 1037 additions and 751 deletions

View File

@@ -27,6 +27,7 @@
#include "procevents.h"
#include "dcrop.h"
#include "LUT.h"
#include "../rtgui/threadutils.h"
namespace rtengine {
@@ -123,7 +124,7 @@ class ImProcCoordinator : public StagedImageProcessor {
bool resultValid;
Glib::Mutex minit;
MyMutex minit;
void progress (Glib::ustring str, int pr);
void reallocAll ();
@@ -131,13 +132,13 @@ class ImProcCoordinator : public StagedImageProcessor {
void setScale (int prevscale);
void updatePreviewImage (int todo, Crop* cropCall= NULL);
Glib::Mutex mProcessing;
MyMutex mProcessing;
ProcParams params;
// members of the updater:
Glib::Thread* thread;
Glib::Mutex updaterThreadStart;
Glib::Mutex paramsUpdateMutex;
MyMutex updaterThreadStart;
MyMutex paramsUpdateMutex;
int changeSinceLast;
bool updaterRunning;
ProcParams nextParams;