From 161d24377c34c9254a132a9e769fbf11456b5b17 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Fri, 3 Jun 2022 11:30:25 +0200 Subject: libcamera: request: Add operator<<() With the recent addition of operator<<() in most libcamera core classes to replace usage of the toString() function the Request class was left behind. Add operator<<() for the Request class and reimplement toString(). Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/libcamera/request.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/libcamera/request.cpp') diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 5704972d..51d74b29 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -582,16 +582,28 @@ bool Request::hasPendingBuffers() const std::string Request::toString() const { std::stringstream ss; + ss << *this; + return ss.str(); +} + +/** + * \brief Insert a text representation of a Request into an output stream + * \param[in] out The output stream + * \param[in] r The Request + * \return The output stream \a out + */ +std::ostream &operator<<(std::ostream &out, const Request &r) +{ /* Pending, Completed, Cancelled(X). */ static const char *statuses = "PCX"; /* Example Output: Request(55:P:1/2:6523524) */ - ss << "Request(" << sequence() << ":" << statuses[status_] << ":" - << _d()->pending_.size() << "/" << bufferMap_.size() << ":" - << cookie_ << ")"; + out << "Request(" << r.sequence() << ":" << statuses[r.status()] << ":" + << r._d()->pending_.size() << "/" << r.buffers().size() << ":" + << r.cookie() << ")"; - return ss.str(); + return out; } } /* namespace libcamera */ -- cgit v1.2.1