liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review IdleRegister (#4892)

Browse Source 
This turns `IdleRegister::add()` into a template function to make the
provided function pointers type safe. It also adds a `delete_data`
parameter to manage the provided data pointer even in `destroy()`.
This commit is contained in:
Flössie 2018-10-28 13:12:01 +01:00
parent 7038104a20
commit 5906329485
27 changed files with 708 additions and 697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rtgui/batchqueue.cc
View File

@ -50,12 +50,10 @@ struct NLParams {
Glib::ustring queueErrorMessage; Glib::ustring queueErrorMessage;
}; };
int bqnotifylistenerUI (void* data) bool bqnotifylistenerUI(NLParams* params)
{ {
NLParams* params = static_cast<NLParams*>(data);
params->listener->queueSizeChanged (params->qsize, params->queueEmptied, params->queueError, params->queueErrorMessage); params->listener->queueSizeChanged (params->qsize, params->queueEmptied, params->queueError, params->queueErrorMessage);
delete params; return false;
return 0;
} }
} }
@ -438,16 +436,12 @@ void BatchQueue::cancelItems (const std::vector<ThumbBrowserEntryBase*>& items)
if (entry->thumbnail) if (entry->thumbnail)
entry->thumbnail->imageRemovedFromQueue (); entry->thumbnail->imageRemovedFromQueue ();
const auto func = [](gpointer data) -> gboolean { const auto func = [](BatchQueueEntry* bqe) -> bool {
const BatchQueueEntry* const bqe = static_cast<BatchQueueEntry*>(data);
::g_remove(bqe->savedParamsFile.c_str()); ::g_remove(bqe->savedParamsFile.c_str());
delete bqe; return false;
return FALSE;
}; };
idle_register.add(func, entry); idle_register.add<BatchQueueEntry>(func, entry, true);
} }
for (const auto entry : fd) for (const auto entry : fd)
@ -608,12 +602,14 @@ void BatchQueue::setProgress(double p)
} }
// No need to acquire the GUI, setProgressUI will do it // No need to acquire the GUI, setProgressUI will do it
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<BatchQueue*>(data)->redraw(); [](BatchQueue* bq) -> bool
return FALSE; {
bq->redraw();
return false;
}; };
idle_register.add(func, this); idle_register.add<BatchQueue>(func, this, false);
} }
void BatchQueue::setProgressStr(const Glib::ustring& str) void BatchQueue::setProgressStr(const Glib::ustring& str)
@ -643,7 +639,7 @@ void BatchQueue::error(const Glib::ustring& descr)
params->queueEmptied = false; params->queueEmptied = false;
params->queueError = true; params->queueError = true;
params->queueErrorMessage = descr; params->queueErrorMessage = descr;
idle_register.add(bqnotifylistenerUI, params); idle_register.add<NLParams>(bqnotifylistenerUI, params, true);
} }
} }
@ -985,7 +981,7 @@ void BatchQueue::notifyListener (bool queueEmptied)
} }
params->queueEmptied = queueEmptied; params->queueEmptied = queueEmptied;
params->queueError = false; params->queueError = false;
idle_register.add(bqnotifylistenerUI, params); idle_register.add<NLParams>(bqnotifylistenerUI, params, true);
} }
} }

11
rtgui/batchqueuepanel.cc
View File

@ -170,13 +170,14 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog) : parent(nullptr)
show_all (); show_all ();
if (batchQueue->loadBatchQueue()) { if (batchQueue->loadBatchQueue()) {
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<BatchQueue*>(data)->resizeLoadedQueue(); [](BatchQueue* bq) -> bool
{
return FALSE; bq->resizeLoadedQueue();
return false;
}; };
idle_register.add(func, batchQueue, G_PRIORITY_LOW); idle_register.add<BatchQueue>(func, batchQueue, false, G_PRIORITY_LOW);
} }
} }

32
rtgui/bayerprocess.cc
View File

@ -723,8 +723,10 @@ void BayerProcess::FrameCountChanged(int n, int frameNum)
int n; int n;
int frameNum; int frameNum;
}; };
const auto func = [](gpointer data) -> gboolean {
Data *d = static_cast<Data *>(data); const auto func =
[](Data* d) -> bool
{
BayerProcess *me = d->me; BayerProcess *me = d->me;
me->imageNumber->block (true); me->imageNumber->block (true);
int n = d->n; int n = d->n;
@ -744,28 +746,28 @@ void BayerProcess::FrameCountChanged(int n, int frameNum)
me->imageNumberBox->show(); me->imageNumberBox->show();
} }
me->imageNumber->block (false); me->imageNumber->block (false);
delete d; return false;
return FALSE;
}; };
idle_register.add(func, new Data { this, n, frameNum }); idle_register.add<Data>(func, new Data{this, n, frameNum}, true);
} }
void BayerProcess::autoContrastChanged (double autoContrast) void BayerProcess::autoContrastChanged (double autoContrast)
{ {
struct Data { struct Data {
BayerProcess *me; BayerProcess* self;
double autoContrast; double autoContrast;
}; };
const auto func = [](gpointer data) -> gboolean {
Data *d = static_cast<Data *>(data); const auto func =
BayerProcess *me = d->me; [](Data* data) -> bool
me->disableListener(); {
me->dualDemosaicContrast->setValue(d->autoContrast); BayerProcess* const self = data->self;
me->enableListener(); self->disableListener();
delete d; self->dualDemosaicContrast->setValue(data->autoContrast);
return FALSE; self->enableListener();
return false;
}; };
idle_register.add(func, new Data { this, autoContrast }); idle_register.add<Data>(func, new Data{this, autoContrast}, true);
} }

10
rtgui/blackwhite.cc
View File

@ -375,12 +375,14 @@ void BlackWhite::BWChanged (double redbw, double greenbw, double bluebw)
nextgreenbw = greenbw; nextgreenbw = greenbw;
nextbluebw = bluebw; nextbluebw = bluebw;
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<BlackWhite*>(data)->BWComputed_(); [](BlackWhite* self) -> bool
return FALSE; {
self->BWComputed_();
return false;
}; };
idle_register.add(func, this); idle_register.add<BlackWhite>(func, this, false);
} }
bool BlackWhite::BWComputed_ () bool BlackWhite::BWComputed_ ()

60
rtgui/colorappearance.cc
View File

@ -1457,58 +1457,58 @@ void ColorAppearance::autoCamChanged (double ccam, double ccamout)
double ccamout; double ccamout;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Data *d = static_cast<Data *>(data); [](Data* data) -> bool
ColorAppearance *me = d->me; {
me->disableListener(); ColorAppearance* const self = data->me;
me->degree->setValue(d->ccam); self->disableListener();
me->degreeout->setValue(d->ccamout); self->degree->setValue(data->ccam);
me->enableListener(); self->degreeout->setValue(data->ccamout);
delete d; self->enableListener();
return FALSE; return false;
}; };
idle_register.add(func, new Data { this, ccam, ccamout }); idle_register.add<Data>(func, new Data{this, ccam, ccamout}, true);
} }
void ColorAppearance::adapCamChanged (double cadap) void ColorAppearance::adapCamChanged (double cadap)
{ {
struct Data { struct Data {
ColorAppearance *me; ColorAppearance* self;
double cadap; double cadap;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Data *d = static_cast<Data *>(data); [](Data* data) -> bool
ColorAppearance *me = d->me; {
me->disableListener(); ColorAppearance* const self = data->self;
me->adapscen->setValue(d->cadap); self->disableListener();
me->enableListener(); self->adapscen->setValue(data->cadap);
delete d; self->enableListener();
return FALSE; return false;
}; };
idle_register.add(func, new Data { this, cadap }); idle_register.add<Data>(func, new Data{this, cadap}, true);
} }
void ColorAppearance::ybCamChanged (int ybsc) void ColorAppearance::ybCamChanged (int ybsc)
{ {
struct Data { struct Data {
ColorAppearance *me; ColorAppearance* self;
int ybsc; int ybsc;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Data *d = static_cast<Data *>(data); [](Data* data) -> bool
ColorAppearance *me = d->me; {
me->disableListener(); ColorAppearance* self = data->self;
me->ybscen->setValue(d->ybsc); self->disableListener();
me->enableListener(); self->ybscen->setValue(data->ybsc);
delete d; self->enableListener();
return FALSE; return false;
}; };
idle_register.add(func, new Data { this, ybsc }); idle_register.add<Data>(func, new Data{this, ybsc}, true);
} }
void ColorAppearance::colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller *caller) void ColorAppearance::colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller *caller)

22
rtgui/colortoning.cc
View File

@ -690,23 +690,23 @@ void ColorToning::setAdjusterBehavior (bool splitAdd, bool satThresholdAdd, bool
void ColorToning::autoColorTonChanged(int satthres, int satprot) void ColorToning::autoColorTonChanged(int satthres, int satprot)
{ {
struct Data { struct Data {
ColorToning *me; ColorToning *self;
int satthres; int satthres;
int satprot; int satprot;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Data *d = static_cast<Data *>(data); [](Data* data) -> bool
ColorToning *me = d->me; {
me->disableListener(); ColorToning* const self = data->self;
me->satProtectionThreshold->setValue(d->satthres); self->disableListener();
me->saturatedOpacity->setValue(d->satprot); self->satProtectionThreshold->setValue(data->satthres);
me->enableListener (); self->saturatedOpacity->setValue(data->satprot);
delete d; self->enableListener();
return FALSE; return false;
}; };
idle_register.add(func, new Data { this, satthres, satprot }); idle_register.add<Data>(func, new Data{this, satthres, satprot}, true);
} }
void ColorToning::adjusterChanged (ThresholdAdjuster* a, double newBottom, double newTop) void ColorToning::adjusterChanged (ThresholdAdjuster* a, double newBottom, double newTop)

60
rtgui/crop.cc
View File

@ -38,18 +38,16 @@ public:
: crop(_crop), notify(_notify) {} : crop(_crop), notify(_notify) {}
}; };
int refreshSpinsUI (void* data) bool refreshSpinsUI(RefreshSpinHelper* rsh)
{ {
RefreshSpinHelper* rsh = static_cast<RefreshSpinHelper*>(data);
rsh->crop->refreshSpins(rsh->notify); rsh->crop->refreshSpins(rsh->notify);
delete rsh; return false;
return 0;
} }
int notifyListenerUI (void* data) bool notifyListenerUI(Crop* self)
{ {
static_cast<Crop*>(data)->notifyListener(); self->notifyListener();
return 0; return false;
} }
} }
@ -515,16 +513,14 @@ void Crop::enabledChanged ()
void Crop::hFlipCrop () void Crop::hFlipCrop ()
{ {
nx = maxw - nx - nw; nx = maxw - nx - nw;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::vFlipCrop () void Crop::vFlipCrop ()
{ {
ny = maxh - ny - nh; ny = maxh - ny - nh;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::rotateCrop (int deg, bool hflip, bool vflip) void Crop::rotateCrop (int deg, bool hflip, bool vflip)
@ -564,7 +560,7 @@ void Crop::rotateCrop (int deg, bool hflip, bool vflip)
} }
lastRotationDeg = deg; lastRotationDeg = deg;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::positionChanged () void Crop::positionChanged ()
@ -578,7 +574,7 @@ void Crop::positionChanged ()
int W = nw; int W = nw;
int H = nh; int H = nh;
cropMoved (X, Y, W, H); cropMoved (X, Y, W, H);
idle_register.add(notifyListenerUI, this); idle_register.add<Crop>(notifyListenerUI, this, false);
} }
void Crop::widthChanged () void Crop::widthChanged ()
@ -591,7 +587,7 @@ void Crop::widthChanged ()
int W = (int)w->get_value (); int W = (int)w->get_value ();
int H = nh; int H = nh;
cropWidth2Resized (X, Y, W, H); cropWidth2Resized (X, Y, W, H);
idle_register.add(notifyListenerUI, this); idle_register.add<Crop>(notifyListenerUI, this, false);
} }
void Crop::heightChanged () void Crop::heightChanged ()
@ -604,7 +600,7 @@ void Crop::heightChanged ()
int W = nw; int W = nw;
int H = (int)h->get_value (); int H = (int)h->get_value ();
cropHeight2Resized (X, Y, W, H); cropHeight2Resized (X, Y, W, H);
idle_register.add(notifyListenerUI, this); idle_register.add<Crop>(notifyListenerUI, this, false);
} }
// Fixed ratio toggle button // Fixed ratio toggle button
@ -656,7 +652,7 @@ void Crop::adjustCropToRatio()
} }
// This will save the options // This will save the options
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, true)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, true), true);
} }
void Crop::refreshSize () void Crop::refreshSize ()
@ -742,14 +738,14 @@ void Crop::sizeChanged(int x, int y, int ow, int oh)
y y
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Params* const params = static_cast<Params*>(data); [](Params* params) -> bool
{
params->crop->setDimensions(params->x, params->y); params->crop->setDimensions(params->x, params->y);
delete params; return false;
return FALSE;
}; };
idle_register.add(func, params); idle_register.add<Params>(func, params, true);
} }
bool Crop::refreshSpins (bool notify) bool Crop::refreshSpins (bool notify)
@ -813,7 +809,7 @@ void Crop::cropMoved (int &X, int &Y, int &W, int &H)
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
// Glib::signal_idle().connect (sigc::mem_fun(*this, &Crop::refreshSpins)); // Glib::signal_idle().connect (sigc::mem_fun(*this, &Crop::refreshSpins));
} }
@ -857,7 +853,7 @@ void Crop::cropWidth1Resized (int &X, int &Y, int &W, int &H, float custom_ratio
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropWidth2Resized (int &X, int &Y, int &W, int &H, float custom_ratio) void Crop::cropWidth2Resized (int &X, int &Y, int &W, int &H, float custom_ratio)
@ -897,7 +893,7 @@ void Crop::cropWidth2Resized (int &X, int &Y, int &W, int &H, float custom_ratio
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropHeight1Resized (int &X, int &Y, int &W, int &H, float custom_ratio) void Crop::cropHeight1Resized (int &X, int &Y, int &W, int &H, float custom_ratio)
@ -940,7 +936,7 @@ void Crop::cropHeight1Resized (int &X, int &Y, int &W, int &H, float custom_rati
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropHeight2Resized (int &X, int &Y, int &W, int &H, float custom_ratio) void Crop::cropHeight2Resized (int &X, int &Y, int &W, int &H, float custom_ratio)
@ -980,7 +976,7 @@ void Crop::cropHeight2Resized (int &X, int &Y, int &W, int &H, float custom_rati
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropTopLeftResized (int &X, int &Y, int &W, int &H, float custom_ratio) void Crop::cropTopLeftResized (int &X, int &Y, int &W, int &H, float custom_ratio)
@ -1022,7 +1018,7 @@ void Crop::cropTopLeftResized (int &X, int &Y, int &W, int &H, float custom_rati
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropTopRightResized (int &X, int &Y, int &W, int &H, float custom_ratio) void Crop::cropTopRightResized (int &X, int &Y, int &W, int &H, float custom_ratio)
@ -1062,7 +1058,7 @@ void Crop::cropTopRightResized (int &X, int &Y, int &W, int &H, float custom_rat
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropBottomLeftResized (int &X, int &Y, int &W, int &H, float custom_ratio) void Crop::cropBottomLeftResized (int &X, int &Y, int &W, int &H, float custom_ratio)
@ -1102,7 +1098,7 @@ void Crop::cropBottomLeftResized (int &X, int &Y, int &W, int &H, float custom_r
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropBottomRightResized (int &X, int &Y, int &W, int &H, float custom_ratio) void Crop::cropBottomRightResized (int &X, int &Y, int &W, int &H, float custom_ratio)
@ -1139,7 +1135,7 @@ void Crop::cropBottomRightResized (int &X, int &Y, int &W, int &H, float custom_
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropInit (int &x, int &y, int &w, int &h) void Crop::cropInit (int &x, int &y, int &w, int &h)
@ -1253,12 +1249,12 @@ void Crop::cropResized (int &x, int &y, int& x2, int& y2)
nw = W; nw = W;
nh = H; nh = H;
idle_register.add(refreshSpinsUI, new RefreshSpinHelper(this, false)); idle_register.add<RefreshSpinHelper>(refreshSpinsUI, new RefreshSpinHelper(this, false), true);
} }
void Crop::cropManipReady () void Crop::cropManipReady ()
{ {
idle_register.add(notifyListenerUI, this); idle_register.add<Crop>(notifyListenerUI, this, false);
} }
double Crop::getRatio () const double Crop::getRatio () const

12
rtgui/crophandler.cc
View File

@ -338,9 +338,9 @@ void CropHandler::setDetailedCrop(
bool expected = false; bool expected = false;
if (redraw_needed.compare_exchange_strong(expected, true)) { if (redraw_needed.compare_exchange_strong(expected, true)) {
const auto func = [](gpointer data) -> gboolean { const auto func =
CropHandler* const self = static_cast<CropHandler*>(data); [](CropHandler* self) -> bool
{
self->cimg.lock (); self->cimg.lock ();
if (self->redraw_needed.exchange(false)) { if (self->redraw_needed.exchange(false)) {
@ -350,7 +350,7 @@ void CropHandler::setDetailedCrop(
self->cropimg.clear(); self->cropimg.clear();
self->cropimgtrue.clear(); self->cropimgtrue.clear();
self->cimg.unlock (); self->cimg.unlock ();
return FALSE; return false;
} }
if (!self->cropimg.empty()) { if (!self->cropimg.empty()) {
@ -398,10 +398,10 @@ void CropHandler::setDetailedCrop(
self->cimg.unlock(); self->cimg.unlock();
} }
return FALSE; return false;
}; };
idle_register.add(func, this/*, G_PRIORITY_HIGH_IDLE*/); idle_register.add<CropHandler>(func, this, false);
} }
} }

70
rtgui/dirpyrdenoise.cc
View File

@ -284,32 +284,32 @@ DirPyrDenoise::~DirPyrDenoise ()
void DirPyrDenoise::chromaChanged (double autchroma, double autred, double autblue) void DirPyrDenoise::chromaChanged (double autchroma, double autred, double autblue)
{ {
struct Data { struct Data {
DirPyrDenoise *me; DirPyrDenoise* self;
double autchroma; double autchroma;
double autred; double autred;
double autblue; double autblue;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Data *d = static_cast<Data *>(data); [](Data* data) -> bool
DirPyrDenoise *me = d->me; {
me->disableListener(); DirPyrDenoise* const self = data->self;
me->chroma->setValue(d->autchroma); self->disableListener();
me->redchro->setValue(d->autred); self->chroma->setValue(data->autchroma);
me->bluechro->setValue(d->autblue); self->redchro->setValue(data->autred);
me->enableListener(); self->bluechro->setValue(data->autblue);
delete d; self->enableListener();
return FALSE; return false;
}; };
idle_register.add(func, new Data { this, autchroma, autred, autblue }); idle_register.add<Data>(func, new Data{this, autchroma, autred, autblue}, true);
} }
void DirPyrDenoise::noiseTilePrev (int tileX, int tileY, int prevX, int prevY, int sizeT, int sizeP) void DirPyrDenoise::noiseTilePrev (int tileX, int tileY, int prevX, int prevY, int sizeT, int sizeP)
{ {
if (!batchMode) { if (!batchMode) {
struct Data { struct Data {
DirPyrDenoise *me; DirPyrDenoise* self;
int tileX; int tileX;
int tileY; int tileY;
int prevX; int prevX;
@ -318,26 +318,26 @@ void DirPyrDenoise::noiseTilePrev (int tileX, int tileY, int prevX, int prevY, i
int sizeP; int sizeP;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Data *d = static_cast<Data *>(data); [](Data* data) -> bool
DirPyrDenoise *me = d->me; {
me->TileLabels->set_text( DirPyrDenoise* self = data->self;
self->TileLabels->set_text(
Glib::ustring::compose(M("TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_TILEINFO"), Glib::ustring::compose(M("TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_TILEINFO"),
Glib::ustring::format(std::fixed, std::setprecision(0), d->sizeT), Glib::ustring::format(std::fixed, std::setprecision(0), data->sizeT),
Glib::ustring::format(std::fixed, std::setprecision(0), d->tileX), Glib::ustring::format(std::fixed, std::setprecision(0), data->tileX),
Glib::ustring::format(std::fixed, std::setprecision(0), d->tileY)) Glib::ustring::format(std::fixed, std::setprecision(0), data->tileY))
); );
me->PrevLabels->set_text( self->PrevLabels->set_text(
Glib::ustring::compose(M("TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_INFO"), Glib::ustring::compose(M("TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_INFO"),
Glib::ustring::format(std::fixed, std::setprecision(0), d->sizeP), Glib::ustring::format(std::fixed, std::setprecision(0), data->sizeP),
Glib::ustring::format(std::fixed, std::setprecision(0), d->prevX), Glib::ustring::format(std::fixed, std::setprecision(0), data->prevX),
Glib::ustring::format(std::fixed, std::setprecision(0), d->prevY)) Glib::ustring::format(std::fixed, std::setprecision(0), data->prevY))
); );
delete d; return false;
return FALSE;
}; };
idle_register.add(func, new Data { this, tileX, tileY, prevX, prevY, sizeT, sizeP }); idle_register.add<Data>(func, new Data{this, tileX, tileY, prevX, prevY, sizeT, sizeP}, true);
} }
} }
@ -345,20 +345,20 @@ void DirPyrDenoise::noiseChanged (double nresid, double highresid)
{ {
if (!batchMode) { if (!batchMode) {
struct Data { struct Data {
DirPyrDenoise *me; DirPyrDenoise* self;
double nresid; double nresid;
double highresid; double highresid;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Data *d = static_cast<Data *>(data); [](Data* data) -> bool
DirPyrDenoise *me = d->me; {
me->updateNoiseLabel(d->nresid, d->highresid); DirPyrDenoise* const self = data->self;
delete d; self->updateNoiseLabel(data->nresid, data->highresid);
return FALSE; return false;
}; };
idle_register.add(func, new Data { this, nresid, highresid }); idle_register.add<Data>(func, new Data{this, nresid, highresid}, true);
} }
} }

41
rtgui/editorpanel.cc
View File

@ -45,10 +45,8 @@ struct spparams {
Glib::RefPtr<Gtk::CssProvider> cssProvider; Glib::RefPtr<Gtk::CssProvider> cssProvider;
}; };
int setprogressStrUI ( void *p ) bool setprogressStrUI(spparams* s)
{ {
spparams *s = static_cast<spparams*> (p);
if ( ! s->str.empty() ) { if ( ! s->str.empty() ) {
s->pProgress->set_text ( M (s->str) ); s->pProgress->set_text ( M (s->str) );
} }
@ -67,8 +65,7 @@ int setprogressStrUI ( void *p )
} }
} }
delete s; return false;
return FALSE;
} }
@ -1192,7 +1189,7 @@ void EditorPanel::setProgress(double p)
spparams *s = new spparams; spparams *s = new spparams;
s->val = p; s->val = p;
s->pProgress = progressLabel; s->pProgress = progressLabel;
idle_register.add(setprogressStrUI, s); idle_register.add<spparams>(setprogressStrUI, s, true);
} }
void EditorPanel::setProgressStr(const Glib::ustring& str) void EditorPanel::setProgressStr(const Glib::ustring& str)
@ -1201,7 +1198,7 @@ void EditorPanel::setProgressStr(const Glib::ustring& str)
s->str = str; s->str = str;
s->val = -1; s->val = -1;
s->pProgress = progressLabel; s->pProgress = progressLabel;
idle_register.add(setprogressStrUI, s); idle_register.add<spparams>(setprogressStrUI, s, true);
} }
void EditorPanel::setProgressState(bool inProcessing) void EditorPanel::setProgressState(bool inProcessing)
@ -1217,9 +1214,9 @@ void EditorPanel::setProgressState(bool inProcessing)
p->inProcessing = inProcessing; p->inProcessing = inProcessing;
p->epih = epih; p->epih = epih;
const auto func = [] (gpointer data) -> gboolean { const auto func =
spsparams* const p = static_cast<spsparams*> (data); [](spsparams* p) -> bool
{
if (p->epih->destroyed) if (p->epih->destroyed)
{ {
if (p->epih->pending == 1) { if (p->epih->pending == 1) {
@ -1228,19 +1225,16 @@ void EditorPanel::setProgressState(bool inProcessing)
p->epih->pending--; p->epih->pending--;
} }
delete p; return false;
return 0;
} }
p->epih->epanel->refreshProcessingState (p->inProcessing); p->epih->epanel->refreshProcessingState (p->inProcessing);
p->epih->pending--; p->epih->pending--;
delete p;
return FALSE; return false;
}; };
idle_register.add (func, p); idle_register.add<spsparams>(func, p, true);
} }
void EditorPanel::error(const Glib::ustring& descr) void EditorPanel::error(const Glib::ustring& descr)
@ -1261,9 +1255,9 @@ void EditorPanel::error(const Glib::ustring& title, const Glib::ustring& descr)
p->title = title; p->title = title;
p->epih = epih; p->epih = epih;
const auto func = [] (gpointer data) -> gboolean { const auto func =
errparams* const p = static_cast<errparams*> (data); [](errparams* p) -> bool
{
if (p->epih->destroyed) if (p->epih->destroyed)
{ {
if (p->epih->pending == 1) { if (p->epih->pending == 1) {
@ -1272,19 +1266,16 @@ void EditorPanel::error(const Glib::ustring& title, const Glib::ustring& descr)
p->epih->pending--; p->epih->pending--;
} }
delete p; return false;
return 0;
} }
p->epih->epanel->displayError (p->title, p->descr); p->epih->epanel->displayError (p->title, p->descr);
p->epih->pending--; p->epih->pending--;
delete p;
return FALSE; return false;
}; };
idle_register.add (func, p); idle_register.add<errparams>(func, p, true);
} }
void EditorPanel::displayError(const Glib::ustring& title, const Glib::ustring& descr) void EditorPanel::displayError(const Glib::ustring& title, const Glib::ustring& descr)

30
rtgui/filebrowser.cc
View File

@ -568,31 +568,30 @@ void FileBrowser::doubleClicked (ThumbBrowserEntryBase* entry)
void FileBrowser::addEntry (FileBrowserEntry* entry) void FileBrowser::addEntry (FileBrowserEntry* entry)
{ {
struct addparams { struct addparams {
FileBrowser *browser; FileBrowser* self;
FileBrowserEntry* entry; FileBrowserEntry* entry;
unsigned int session_id; unsigned int session_id;
}; };
addparams* const ap = new addparams; addparams* const ap = new addparams;
entry->setParent (this); entry->setParent (this);
ap->browser = this; ap->self = this;
ap->entry = entry; ap->entry = entry;
ap->session_id = session_id(); ap->session_id = session_id();
const auto func = [](gpointer data) -> gboolean { const auto func =
addparams* const ap = static_cast<addparams*>(data); [](addparams* ap) -> bool
if (ap->session_id != ap->browser->session_id()) { {
if (ap->session_id != ap->self->session_id()) {
delete ap->entry; delete ap->entry;
delete ap;
} else { } else {
ap->browser->addEntry_(ap->entry); ap->self->addEntry_(ap->entry);
delete ap;
} }
return FALSE; return false;
}; };
idle_register.add(func, ap); idle_register.add<addparams>(func, ap, true);
} }
void FileBrowser::addEntry_ (FileBrowserEntry* entry) void FileBrowser::addEntry_ (FileBrowserEntry* entry)
@ -1935,13 +1934,14 @@ void FileBrowser::_thumbRearrangementNeeded ()
void FileBrowser::thumbRearrangementNeeded () void FileBrowser::thumbRearrangementNeeded ()
{ {
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<FileBrowser*>(data)->_thumbRearrangementNeeded(); [](FileBrowser* self) -> bool
{
return FALSE; self->_thumbRearrangementNeeded();
return false;
}; };
idle_register.add(func, this); idle_register.add<FileBrowser>(func, this, false);
} }
void FileBrowser::selectionChanged () void FileBrowser::selectionChanged ()

14
rtgui/filebrowserentry.cc
View File

@ -233,8 +233,9 @@ void FileBrowserEntry::updateImage(rtengine::IImage8* img, double scale, const r
const gint priority = G_PRIORITY_LOW; const gint priority = G_PRIORITY_LOW;
const auto func = [](gpointer data) -> gboolean { const auto func =
tiupdate* const params = static_cast<tiupdate*>(data); [](tiupdate* params) -> bool
{
FileBrowserEntryIdleHelper* const feih = params->feih; FileBrowserEntryIdleHelper* const feih = params->feih;
if (feih->destroyed) { if (feih->destroyed) {
@ -245,19 +246,16 @@ void FileBrowserEntry::updateImage(rtengine::IImage8* img, double scale, const r
} }
params->img->free (); params->img->free ();
delete params; return false;
return 0;
} }
feih->fbentry->_updateImage (params->img, params->scale, params->cropParams); feih->fbentry->_updateImage (params->img, params->scale, params->cropParams);
feih->pending--; feih->pending--;
delete params; return false;
return FALSE;
}; };
idle_register.add(func, param, priority); idle_register.add<tiupdate>(func, param, true, priority);
} }
void FileBrowserEntry::_updateImage(rtengine::IImage8* img, double s, const rtengine::procparams::CropParams& cropParams) void FileBrowserEntry::_updateImage(rtengine::IImage8* img, double s, const rtengine::procparams::CropParams& cropParams)

33
rtgui/filecatalog.cc
View File

@ -873,13 +873,14 @@ void FileCatalog::previewsFinished (int dir_id)
currentEFS = dirEFS; currentEFS = dirEFS;
} }
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<FileCatalog*>(data)->previewsFinishedUI(); [](FileCatalog* self) -> bool
{
return FALSE; self->previewsFinishedUI();
return false;
}; };
idle_register.add(func, this); idle_register.add<FileCatalog>(func, this, false);
} }
void FileCatalog::setEnabled (bool e) void FileCatalog::setEnabled (bool e)
@ -941,24 +942,22 @@ struct FCOIParams {
std::vector<Thumbnail*> tmb; std::vector<Thumbnail*> tmb;
}; };
int openRequestedUI (void* p) bool openRequestedUI(FCOIParams* params)
{ {
FCOIParams* params = static_cast<FCOIParams*>(p);
params->catalog->_openImage (params->tmb); params->catalog->_openImage (params->tmb);
delete params; return false;
return 0;
} }
void FileCatalog::filterApplied() void FileCatalog::filterApplied()
{ {
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<FileCatalog*>(data)->_refreshProgressBar(); [](FileCatalog* self) -> bool
{
return FALSE; self->_refreshProgressBar();
return false;
}; };
idle_register.add(func, this); idle_register.add<FileCatalog>(func, this, false);
} }
void FileCatalog::openRequested(const std::vector<Thumbnail*>& tmb) void FileCatalog::openRequested(const std::vector<Thumbnail*>& tmb)
@ -971,7 +970,7 @@ void FileCatalog::openRequested(const std::vector<Thumbnail*>& tmb)
tmb[i]->increaseRef (); tmb[i]->increaseRef ();
} }
idle_register.add(openRequestedUI, params); idle_register.add<FCOIParams>(openRequestedUI, params, true);
} }
void FileCatalog::deleteRequested(const std::vector<FileBrowserEntry*>& tbe, bool inclBatchProcessed) void FileCatalog::deleteRequested(const std::vector<FileBrowserEntry*>& tbe, bool inclBatchProcessed)
@ -1903,7 +1902,7 @@ void FileCatalog::addAndOpenFile (const Glib::ustring& fname)
params->catalog = this; params->catalog = this;
params->tmb.push_back (tmb); params->tmb.push_back (tmb);
tmb->increaseRef (); tmb->increaseRef ();
idle_register.add(openRequestedUI, params); idle_register.add<FCOIParams>(openRequestedUI, params, true);
} catch(Gio::Error&) {} } catch(Gio::Error&) {}
} }

10
rtgui/filepanel.cc
View File

@ -139,12 +139,14 @@ FilePanel::FilePanel () : parent(nullptr), error(0)
fileCatalog->setFileSelectionListener (this); fileCatalog->setFileSelectionListener (this);
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<FilePanel*>(data)->init(); [](FilePanel* self) -> bool
return FALSE; {
self->init();
return false;
}; };
idle_register.add(func, this); idle_register.add<FilePanel>(func, this, false);
show_all (); show_all ();
} }

21
rtgui/flatfield.cc
View File

@ -412,18 +412,19 @@ void FlatField::setShortcutPath(const Glib::ustring& path)
void FlatField::flatFieldAutoClipValueChanged(int n) void FlatField::flatFieldAutoClipValueChanged(int n)
{ {
struct Data { struct Data {
FlatField *me; FlatField* self;
int n; int n;
}; };
const auto func = [](gpointer data) -> gboolean {
Data *d = static_cast<Data *>(data); const auto func =
FlatField *me = d->me; [](Data* data) -> bool
me->disableListener(); {
me->flatFieldClipControl->setValue (d->n); FlatField* const self = data->self;
me->enableListener(); self->disableListener();
delete d; self->flatFieldClipControl->setValue (data->n);
return FALSE; self->enableListener();
return false;
}; };
idle_register.add(func, new Data { this, n }); idle_register.add<Data>(func, new Data{this, n}, true);
} }

31
rtgui/guiutils.cc
View File

@ -43,39 +43,14 @@ IdleRegister::~IdleRegister()
destroy(); destroy();
} }
void IdleRegister::add(GSourceFunc function, gpointer data, gint priority)
{
const auto dispatch = [](gpointer data) -> gboolean {
DataWrapper* const data_wrapper = static_cast<DataWrapper*>(data);
if (!data_wrapper->function(data_wrapper->data)) {
data_wrapper->self->mutex.lock();
data_wrapper->self->ids.erase(data_wrapper);
data_wrapper->self->mutex.unlock();
delete data_wrapper;
return FALSE;
}
return TRUE;
};
DataWrapper* const data_wrapper = new DataWrapper{
this,
function,
data
};
mutex.lock();
ids[data_wrapper] = gdk_threads_add_idle_full(priority, dispatch, data_wrapper, nullptr);
mutex.unlock();
}
void IdleRegister::destroy() void IdleRegister::destroy()
{ {
mutex.lock(); mutex.lock();
for (const auto& id : ids) { for (const auto& id : ids) {
g_source_remove(id.second); g_source_remove(id.second);
if (id.first->deleter) {
id.first->deleter(id.first->data);
}
delete id.first; delete id.first;
} }
ids.clear(); ids.clear();

50
rtgui/guiutils.h
View File

@ -50,7 +50,54 @@ class IdleRegister final :
public: public:
~IdleRegister(); ~IdleRegister();
void add(GSourceFunc function, gpointer data, gint priority = G_PRIORITY_DEFAULT_IDLE); template<typename DATA>
void add(bool (*function)(DATA*), DATA* data, bool delete_data, gint priority = G_PRIORITY_DEFAULT_IDLE)
{
const auto dispatch =
[](gpointer data) -> gboolean
{
DataWrapper* const data_wrapper = static_cast<DataWrapper*>(data);
// This is safe as per https://en.cppreference.com/w/cpp/language/reinterpret_cast item 7)
if (!reinterpret_cast<bool (*)(DATA*)>(data_wrapper->function)(static_cast<DATA*>(data_wrapper->data))) {
data_wrapper->self->mutex.lock();
data_wrapper->self->ids.erase(data_wrapper);
data_wrapper->self->mutex.unlock();
if (data_wrapper->deleter) {
data_wrapper->deleter(data_wrapper->data);
}
delete data_wrapper;
return FALSE;
}
return TRUE;
};
DataWrapper* const data_wrapper = new DataWrapper{
this,
reinterpret_cast<GSourceFunc>(function),
data,
[delete_data]() -> GSourceFunc
{
if (delete_data) {
return
[](gpointer data) -> gboolean
{
delete static_cast<DATA*>(data);
return TRUE;
};
}
return nullptr;
}()
};
mutex.lock();
ids[data_wrapper] = gdk_threads_add_idle_full(priority, dispatch, data_wrapper, nullptr);
mutex.unlock();
}
void destroy(); void destroy();
private: private:
@ -58,6 +105,7 @@ private:
IdleRegister* const self; IdleRegister* const self;
GSourceFunc function; GSourceFunc function;
gpointer data; gpointer data;
GSourceFunc deleter;
}; };
std::map<const DataWrapper*, guint> ids; std::map<const DataWrapper*, guint> ids;

24
rtgui/histogrampanel.cc
View File

@ -562,9 +562,9 @@ void HistogramRGBArea::update (int valh, int rh, int gh, int bh)
harih->pending++; harih->pending++;
const auto func = [](gpointer data) -> gboolean { const auto func =
HistogramRGBAreaIdleHelper* const harih = static_cast<HistogramRGBAreaIdleHelper*>(data); [](HistogramRGBAreaIdleHelper* harih) -> bool
{
if (harih->destroyed) { if (harih->destroyed) {
if (harih->pending == 1) { if (harih->pending == 1) {
delete harih; delete harih;
@ -572,7 +572,7 @@ void HistogramRGBArea::update (int valh, int rh, int gh, int bh)
harih->pending--; harih->pending--;
} }
return 0; return false;
} }
harih->harea->updateBackBuffer(-1, -1, -1); harih->harea->updateBackBuffer(-1, -1, -1);
@ -580,10 +580,10 @@ void HistogramRGBArea::update (int valh, int rh, int gh, int bh)
harih->pending--; harih->pending--;
return FALSE; return false;
}; };
idle_register.add(func, harih); idle_register.add<HistogramRGBAreaIdleHelper>(func, harih, false);
} }
void HistogramRGBArea::updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, bool bar) void HistogramRGBArea::updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, bool bar)
@ -761,9 +761,9 @@ void HistogramArea::update(
haih->pending++; haih->pending++;
// Can be done outside of the GUI thread // Can be done outside of the GUI thread
const auto func = [](gpointer data) -> gboolean { const auto func =
HistogramAreaIdleHelper* const haih = static_cast<HistogramAreaIdleHelper*>(data); [](HistogramAreaIdleHelper* haih) -> bool
{
if (haih->destroyed) { if (haih->destroyed) {
if (haih->pending == 1) { if (haih->pending == 1) {
delete haih; delete haih;
@ -771,7 +771,7 @@ void HistogramArea::update(
haih->pending--; haih->pending--;
} }
return 0; return false;
} }
haih->harea->setDirty (true); haih->harea->setDirty (true);
@ -780,10 +780,10 @@ void HistogramArea::update(
haih->pending--; haih->pending--;
return FALSE; return false;
}; };
idle_register.add(func, haih); idle_register.add<HistogramAreaIdleHelper>(func, haih, false);
} }
void HistogramArea::updateBackBuffer () void HistogramArea::updateBackBuffer ()

12
rtgui/mydiagonalcurve.cc
View File

@ -1516,9 +1516,9 @@ void MyDiagonalCurve::updateBackgroundHistogram (LUTu & hist)
mcih->pending++; mcih->pending++;
const auto func = [](gpointer data) -> gboolean { const auto func =
MyCurveIdleHelper* const mcih = static_cast<MyCurveIdleHelper*>(data); [](MyCurveIdleHelper* mcih) -> bool
{
if (mcih->destroyed) { if (mcih->destroyed) {
if (mcih->pending == 1) { if (mcih->pending == 1) {
delete mcih; delete mcih;
@ -1526,7 +1526,7 @@ void MyDiagonalCurve::updateBackgroundHistogram (LUTu & hist)
mcih->pending--; mcih->pending--;
} }
return 0; return false;
} }
mcih->clearPixmap (); mcih->clearPixmap ();
@ -1534,10 +1534,10 @@ void MyDiagonalCurve::updateBackgroundHistogram (LUTu & hist)
mcih->pending--; mcih->pending--;
return FALSE; return false;
}; };
idle_register.add(func, mcih); idle_register.add<MyCurveIdleHelper>(func, mcih, false);
} }
void MyDiagonalCurve::reset(const std::vector<double> &resetCurve, double identityValue) void MyDiagonalCurve::reset(const std::vector<double> &resetCurve, double identityValue)

46
rtgui/previewhandler.cc
View File

@ -67,8 +67,9 @@ void PreviewHandler::setImage(rtengine::IImage8* i, double scale, const rtengine
iap->scale = scale; iap->scale = scale;
iap->cp = cp; iap->cp = cp;
const auto func = [](gpointer data) -> gboolean { const auto func =
iaimgpar* const iap = static_cast<iaimgpar*>(data); [](iaimgpar* iap) -> bool
{
PreviewHandlerIdleHelper* const pih = iap->pih; PreviewHandlerIdleHelper* const pih = iap->pih;
if (pih->destroyed) { if (pih->destroyed) {
@ -78,9 +79,7 @@ void PreviewHandler::setImage(rtengine::IImage8* i, double scale, const rtengine
pih->pending--; pih->pending--;
} }
delete iap; return false;
return FALSE;
} }
if (pih->phandler->image) { if (pih->phandler->image) {
@ -95,12 +94,11 @@ void PreviewHandler::setImage(rtengine::IImage8* i, double scale, const rtengine
pih->phandler->cropParams = iap->cp; pih->phandler->cropParams = iap->cp;
pih->phandler->previewScale = iap->scale; pih->phandler->previewScale = iap->scale;
pih->pending--; pih->pending--;
delete iap;
return FALSE; return false;
}; };
idle_register.add(func, iap); idle_register.add<iaimgpar>(func, iap, true);
} }
@ -112,9 +110,10 @@ void PreviewHandler::delImage(IImage8* i)
iap->image = i; iap->image = i;
iap->pih = pih; iap->pih = pih;
const auto func = [](gpointer data) -> gboolean { const auto func =
iaimgpar* iap = static_cast<iaimgpar*>(data); [](iaimgpar* iap) -> bool
PreviewHandlerIdleHelper* pih = iap->pih; {
PreviewHandlerIdleHelper* const pih = iap->pih;
if (pih->destroyed) { if (pih->destroyed) {
if (pih->pending == 1) { if (pih->pending == 1) {
@ -123,9 +122,7 @@ void PreviewHandler::delImage(IImage8* i)
pih->pending--; pih->pending--;
} }
delete iap; return false;
return FALSE;
} }
if (pih->phandler->image) { if (pih->phandler->image) {
@ -141,12 +138,11 @@ void PreviewHandler::delImage(IImage8* i)
pih->phandler->previewImgMutex.unlock (); pih->phandler->previewImgMutex.unlock ();
pih->pending--; pih->pending--;
delete iap;
return FALSE; return false;
}; };
idle_register.add(func, iap); idle_register.add<iaimgpar>(func, iap, true);
} }
void PreviewHandler::imageReady(const rtengine::procparams::CropParams& cp) void PreviewHandler::imageReady(const rtengine::procparams::CropParams& cp)
@ -156,9 +152,10 @@ void PreviewHandler::imageReady(const rtengine::procparams::CropParams& cp)
iap->pih = pih; iap->pih = pih;
iap->cp = cp; iap->cp = cp;
const auto func = [](gpointer data) -> gboolean { const auto func =
iaimgpar* const iap = static_cast<iaimgpar*>(data); [](iaimgpar* iap) -> bool
PreviewHandlerIdleHelper* pih = iap->pih; {
PreviewHandlerIdleHelper* const pih = iap->pih;
if (pih->destroyed) { if (pih->destroyed) {
if (pih->pending == 1) { if (pih->pending == 1) {
@ -167,9 +164,7 @@ void PreviewHandler::imageReady(const rtengine::procparams::CropParams& cp)
pih->pending--; pih->pending--;
} }
delete iap; return false;
return FALSE;
} }
pih->phandler->previewImgMutex.lock (); pih->phandler->previewImgMutex.lock ();
@ -178,12 +173,11 @@ void PreviewHandler::imageReady(const rtengine::procparams::CropParams& cp)
pih->phandler->cropParams = iap->cp; pih->phandler->cropParams = iap->cp;
pih->phandler->previewImageChanged (); pih->phandler->previewImageChanged ();
pih->pending--; pih->pending--;
delete iap;
return FALSE; return false;
}; };
idle_register.add(func, iap); idle_register.add<iaimgpar>(func, iap, true);
} }
Glib::RefPtr<Gdk::Pixbuf> PreviewHandler::getRoughImage (int x, int y, int w, int h, double zoom) Glib::RefPtr<Gdk::Pixbuf> PreviewHandler::getRoughImage (int x, int y, int w, int h, double zoom)

10
rtgui/resize.cc
View File

@ -366,9 +366,9 @@ void Resize::sizeChanged(int mw, int mh, int ow, int oh)
void Resize::setDimensions () void Resize::setDimensions ()
{ {
const auto func = [](gpointer data) -> gboolean { const auto func =
Resize* const self = static_cast<Resize*>(data); [](Resize* self) -> bool
{
self->wconn.block(true); self->wconn.block(true);
self->hconn.block(true); self->hconn.block(true);
self->scale->block(true); self->scale->block(true);
@ -432,10 +432,10 @@ void Resize::setDimensions ()
self->wconn.block(false); self->wconn.block(false);
self->hconn.block(false); self->hconn.block(false);
return FALSE; return false;
}; };
idle_register.add(func, this); idle_register.add<Resize>(func, this, false);
} }
void Resize::fitBoxScale() void Resize::fitBoxScale()

12
rtgui/retinex.cc
View File

@ -673,14 +673,16 @@ void Retinex::minmaxChanged (double cdma, double cdmin, double mini, double maxi
nextminT = Tmin; nextminT = Tmin;
nextmaxT = Tmax; nextmaxT = Tmax;
const auto func = [] (gpointer data) -> gboolean { const auto func =
[](Retinex* self) -> bool
{
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
static_cast<Retinex*> (data)->minmaxComputed_(); // FIXME: The above can't be true?!
self->minmaxComputed_();
return FALSE; return false;
}; };
idle_register.add (func, this); idle_register.add<Retinex>(func, this, false);
} }
bool Retinex::minmaxComputed_ () bool Retinex::minmaxComputed_ ()

22
rtgui/tonecurve.cc
View File

@ -1013,13 +1013,14 @@ void ToneCurve::autoExpChanged(double expcomp, int bright, int contr, int black,
nextHlcomprthresh = hlcomprthresh; nextHlcomprthresh = hlcomprthresh;
nextHLRecons = hlrecons; nextHLRecons = hlrecons;
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<ToneCurve*>(data)->autoExpComputed_(); [](ToneCurve* self) -> bool
{
return FALSE; self->autoExpComputed_();
return false;
}; };
idle_register.add(func, this); idle_register.add<ToneCurve>(func, this, false);
} }
void ToneCurve::autoMatchedToneCurveChanged(rtengine::procparams::ToneCurveParams::TcMode curveMode, const std::vector<double>& curve) void ToneCurve::autoMatchedToneCurveChanged(rtengine::procparams::ToneCurveParams::TcMode curveMode, const std::vector<double>& curve)
@ -1027,11 +1028,12 @@ void ToneCurve::autoMatchedToneCurveChanged(rtengine::procparams::ToneCurveParam
nextToneCurveMode = curveMode; nextToneCurveMode = curveMode;
nextToneCurve = curve; nextToneCurve = curve;
const auto func = [](gpointer data) -> gboolean { const auto func =
static_cast<ToneCurve*>(data)->histmatchingComputed(); [](ToneCurve* self) -> bool
{
return FALSE; self->histmatchingComputed();
return false;
}; };
idle_register.add(func, this); idle_register.add<ToneCurve>(func, this, false);
} }

50
rtgui/toolpanelcoord.cc
View File

@ -263,9 +263,9 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
{ {
if (isRaw) { if (isRaw) {
if (isBayer) { if (isBayer) {
const auto func = [](gpointer data) -> gboolean { const auto func =
ToolPanelCoordinator* const self = static_cast<ToolPanelCoordinator*>(data); [](ToolPanelCoordinator* self) -> bool
{
self->rawPanelSW->set_sensitive (true); self->rawPanelSW->set_sensitive (true);
self->sensorxtrans->FoldableToolPanel::hide(); self->sensorxtrans->FoldableToolPanel::hide();
self->sensorbayer->FoldableToolPanel::show(); self->sensorbayer->FoldableToolPanel::show();
@ -273,14 +273,14 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
self->flatfield->FoldableToolPanel::show(); self->flatfield->FoldableToolPanel::show();
self->retinex->FoldableToolPanel::setGrayedOut(false); self->retinex->FoldableToolPanel::setGrayedOut(false);
return FALSE; return false;
}; };
idle_register.add(func, this); idle_register.add<ToolPanelCoordinator>(func, this, false);
} }
else if (isXtrans) { else if (isXtrans) {
const auto func = [](gpointer data) -> gboolean { const auto func =
ToolPanelCoordinator* const self = static_cast<ToolPanelCoordinator*>(data); [](ToolPanelCoordinator* self) -> bool
{
self->rawPanelSW->set_sensitive (true); self->rawPanelSW->set_sensitive (true);
self->sensorxtrans->FoldableToolPanel::show(); self->sensorxtrans->FoldableToolPanel::show();
self->sensorbayer->FoldableToolPanel::hide(); self->sensorbayer->FoldableToolPanel::hide();
@ -288,14 +288,14 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
self->flatfield->FoldableToolPanel::show(); self->flatfield->FoldableToolPanel::show();
self->retinex->FoldableToolPanel::setGrayedOut(false); self->retinex->FoldableToolPanel::setGrayedOut(false);
return FALSE; return false;
}; };
idle_register.add(func, this); idle_register.add<ToolPanelCoordinator>(func, this, false);
} }
else if (isMono) { else if (isMono) {
const auto func = [](gpointer data) -> gboolean { const auto func =
ToolPanelCoordinator* const self = static_cast<ToolPanelCoordinator*>(data); [](ToolPanelCoordinator* self) -> bool
{
self->rawPanelSW->set_sensitive (true); self->rawPanelSW->set_sensitive (true);
self->sensorbayer->FoldableToolPanel::hide(); self->sensorbayer->FoldableToolPanel::hide();
self->sensorxtrans->FoldableToolPanel::hide(); self->sensorxtrans->FoldableToolPanel::hide();
@ -303,13 +303,13 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
self->flatfield->FoldableToolPanel::show(); self->flatfield->FoldableToolPanel::show();
self->retinex->FoldableToolPanel::setGrayedOut(false); self->retinex->FoldableToolPanel::setGrayedOut(false);
return FALSE; return false;
}; };
idle_register.add(func, this); idle_register.add<ToolPanelCoordinator>(func, this, false);
} else { } else {
const auto func = [](gpointer data) -> gboolean { const auto func =
ToolPanelCoordinator* const self = static_cast<ToolPanelCoordinator*>(data); [](ToolPanelCoordinator* self) -> bool
{
self->rawPanelSW->set_sensitive (true); self->rawPanelSW->set_sensitive (true);
self->sensorbayer->FoldableToolPanel::hide(); self->sensorbayer->FoldableToolPanel::hide();
self->sensorxtrans->FoldableToolPanel::hide(); self->sensorxtrans->FoldableToolPanel::hide();
@ -317,20 +317,20 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
self->flatfield->FoldableToolPanel::hide(); self->flatfield->FoldableToolPanel::hide();
self->retinex->FoldableToolPanel::setGrayedOut(false); self->retinex->FoldableToolPanel::setGrayedOut(false);
return FALSE; return false;
}; };
idle_register.add(func, this); idle_register.add<ToolPanelCoordinator>(func, this, false);
} }
} else { } else {
const auto func = [](gpointer data) -> gboolean { const auto func =
ToolPanelCoordinator* const self = static_cast<ToolPanelCoordinator*>(data); [](ToolPanelCoordinator* self) -> bool
{
self->rawPanelSW->set_sensitive (false); self->rawPanelSW->set_sensitive (false);
self->retinex->FoldableToolPanel::setGrayedOut(true); self->retinex->FoldableToolPanel::setGrayedOut(true);
return FALSE; return false;
}; };
idle_register.add(func, this); idle_register.add<ToolPanelCoordinator>(func, this, false);
} }
} }

18
rtgui/wavelet.cc
View File

@ -888,22 +888,22 @@ void Wavelet::wavChanged (double nlevel)
{ {
if (!batchMode) { if (!batchMode) {
struct Data { struct Data {
Wavelet *me; Wavelet *self;
double nlevel; double nlevel;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
Data *d = static_cast<Data *>(data); [](Data* data) -> bool
Wavelet *me = d->me; {
me->wavLabels->set_text( Wavelet* self = data->self;
self->wavLabels->set_text(
Glib::ustring::compose(M("TP_WAVELET_LEVLABEL"), Glib::ustring::compose(M("TP_WAVELET_LEVLABEL"),
Glib::ustring::format(std::fixed, std::setprecision(0), d->nlevel)) Glib::ustring::format(std::fixed, std::setprecision(0), data->nlevel))
); );
delete d; return false;
return FALSE;
}; };
idle_register.add(func, new Data { this, nlevel }); idle_register.add<Data>(func, new Data{this, nlevel}, true);
} }
} }

15
rtgui/whitebalance.cc
View File

@ -915,11 +915,12 @@ void WhiteBalance::WBChanged(double temperature, double greenVal)
double green_val; double green_val;
}; };
const auto func = [](gpointer data) -> gboolean { const auto func =
WhiteBalance* const self = static_cast<WhiteBalance*>(static_cast<Data*>(data)->self); [](Data* data) -> bool
const double temperature = static_cast<Data*>(data)->temperature; {
const double green_val = static_cast<Data*>(data)->green_val; WhiteBalance* const self = static_cast<WhiteBalance*>(data->self);
delete static_cast<Data*>(data); const double temperature = data->temperature;
const double green_val = data->green_val;
self->disableListener(); self->disableListener();
self->setEnabled(true); self->setEnabled(true);
@ -929,8 +930,8 @@ void WhiteBalance::WBChanged(double temperature, double greenVal)
self->green->setDefault(green_val); self->green->setDefault(green_val);
self->enableListener(); self->enableListener();
return FALSE; return false;
}; };
idle_register.add(func, new Data{this, temperature, greenVal}); idle_register.add<Data>(func, new Data{this, temperature, greenVal}, true);
} }

21
rtgui/xtransprocess.cc
View File

@ -255,18 +255,19 @@ void XTransProcess::checkBoxToggled (CheckBox* c, CheckValue newval)
void XTransProcess::autoContrastChanged (double autoContrast) void XTransProcess::autoContrastChanged (double autoContrast)
{ {
struct Data { struct Data {
XTransProcess *me; XTransProcess* self;
double autoContrast; double autoContrast;
}; };
const auto func = [](gpointer data) -> gboolean {
Data *d = static_cast<Data *>(data); const auto func =
XTransProcess *me = d->me; [](Data* data) -> bool
me->disableListener(); {
me->dualDemosaicContrast->setValue(d->autoContrast); XTransProcess* self = data->self;
me->enableListener(); self->disableListener();
delete d; self->dualDemosaicContrast->setValue(data->autoContrast);
return FALSE; self->enableListener();
return false;
}; };
idle_register.add(func, new Data { this, autoContrast }); idle_register.add<Data>(func, new Data{this, autoContrast}, true);
} }