summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/bound_method.h4
-rw-r--r--include/libcamera/object.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/include/libcamera/bound_method.h b/include/libcamera/bound_method.h
index 06c5a3b1..bdeb5469 100644
--- a/include/libcamera/bound_method.h
+++ b/include/libcamera/bound_method.h
@@ -37,7 +37,7 @@ public:
Object *object() const { return object_; }
ConnectionType connectionType() const { return connectionType_; }
- void activatePack(void *pack);
+ void activatePack(void *pack, bool deleteMethod);
virtual void invokePack(void *pack) = 0;
protected:
@@ -109,7 +109,7 @@ public:
void activate(Args... args)
{
if (this->object_)
- BoundMethodBase::activatePack(new PackType{ args... });
+ BoundMethodBase::activatePack(new PackType{ args... }, false);
else
(static_cast<T *>(this->obj_)->*func_)(args...);
}
diff --git a/include/libcamera/object.h b/include/libcamera/object.h
index 3308330a..603a2292 100644
--- a/include/libcamera/object.h
+++ b/include/libcamera/object.h
@@ -33,10 +33,12 @@ public:
void invokeMethod(void (T::*func)(Args...), Args... args)
{
T *obj = static_cast<T *>(this);
- BoundMethodBase *method = new BoundMemberMethod<T, Args...>(obj, this, func);
+ BoundMethodBase *method =
+ new BoundMemberMethod<T, Args...>(obj, this, func,
+ ConnectionTypeQueued);
void *pack = new typename BoundMemberMethod<T, Args...>::PackType{ args... };
- invokeMethod(method, pack);
+ method->activatePack(pack, true);
}
Thread *thread() const { return thread_; }
@@ -53,8 +55,6 @@ private:
friend class BoundMethodBase;
friend class Thread;
- void invokeMethod(BoundMethodBase *method, void *pack);
-
void notifyThreadMove();
void connect(SignalBase *signal);