android: Simplify thread RPC with Object::invokeMethod()

Replace the manual implementation of asynchronous method invocation
through a custom message with Object::invokeMethod(). This simplifies
the thread RPC implementation.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

1 files changed, 1 insertions, 17 deletions

diff --git a/src/android/thread_rpc.cpp b/src/android/thread_rpc.cpp
index 295a05d7..f57891ff 100644
--- a/src/android/thread_rpc.cpp
+++ b/src/android/thread_rpc.cpp
@@ -5,19 +5,11 @@
  * thread_rpc.cpp - Inter-thread procedure call
  */
 
+#include "thread.h"
 #include "thread_rpc.h"
 
-#include "message.h"
-
 using namespace libcamera;
 
-libcamera::Message::Type ThreadRpcMessage::rpcType_ = Message::Type::None;
-
-ThreadRpcMessage::ThreadRpcMessage()
-	: Message(type())
-{
-}
-
 void ThreadRpc::notifyReception()
 {
 	{
@@ -32,11 +24,3 @@ void ThreadRpc::waitDelivery()
 	libcamera::MutexLocker locker(mutex_);
 	cv_.wait(locker, [&] { return delivered_; });
 }
-
-Message::Type ThreadRpcMessage::type()
-{
-	if (ThreadRpcMessage::rpcType_ == Message::Type::None)
-		rpcType_ = Message::registerMessageType();
-
-	return rpcType_;
-}