From b4415f1c9863a2fda42e1882ed4857de9d9366b1 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 4 Jan 2020 06:48:10 +0200 Subject: v4l2: Use Object::invokeMethod() return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that Object::invokeMethod() supports returning a value, use it and drop the return value method argument. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/v4l2/v4l2_camera.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/v4l2/v4l2_camera.h') diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index d24dbca6..5a889efd 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -48,23 +48,23 @@ public: V4L2Camera(std::shared_ptr camera); ~V4L2Camera(); - void open(int *ret); + int open(); void close(); void getStreamConfig(StreamConfiguration *streamConfig); std::vector completedBuffers(); - void mmap(void **ret, unsigned int index); + void *mmap(unsigned int index); - void configure(int *ret, StreamConfiguration *streamConfigOut, - const Size &size, PixelFormat pixelformat, - unsigned int bufferCount); + int configure(StreamConfiguration *streamConfigOut, + const Size &size, PixelFormat pixelformat, + unsigned int bufferCount); - void allocBuffers(int *ret, unsigned int count); + int allocBuffers(unsigned int count); void freeBuffers(); - void streamOn(int *ret); - void streamOff(int *ret); + int streamOn(); + int streamOff(); - void qbuf(int *ret, unsigned int index); + int qbuf(unsigned int index); Semaphore bufferSema_; -- cgit v1.2.1