From 4dd09daff7bec7b0bcf2f10b06ae653c67ef2654 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Fri, 24 Jun 2016 23:59:25 +0200 Subject: [PATCH] Streaming: Use const reference in place of copying * Thanks to Markus for reporting. --- headers/os/media/MediaFile.h | 12 +++++++----- headers/private/media/MediaExtractor.h | 2 +- headers/private/media/StreamerPlugin.h | 2 +- .../plugins/http_streamer/HTTPStreamerPlugin.cpp | 2 +- .../media/plugins/http_streamer/HTTPStreamerPlugin.h | 2 +- .../plugins/rtsp_streamer/RTSPStreamerPlugin.cpp | 2 +- .../media/plugins/rtsp_streamer/RTSPStreamerPlugin.h | 2 +- src/kits/media/MediaExtractor.cpp | 2 +- src/kits/media/MediaFile.cpp | 8 ++++---- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/headers/os/media/MediaFile.h b/headers/os/media/MediaFile.h index 1b433659e5..bcf1e4c52a 100644 --- a/headers/os/media/MediaFile.h +++ b/headers/os/media/MediaFile.h @@ -72,8 +72,8 @@ public: // Additional constructors used to stream data from protocols // supported by the Streamer API - BMediaFile(BUrl url); - BMediaFile(BUrl url, int32 flags); + BMediaFile(const BUrl& url); + BMediaFile(const BUrl& url, int32 flags); // Read-Write streaming constructor BMediaFile(BUrl destination, const media_file_format* mfi, @@ -84,7 +84,7 @@ public: status_t SetTo(const entry_ref* ref); status_t SetTo(BDataIO* destination); // The streaming equivalent of SetTo - status_t SetTo(BUrl url); + status_t SetTo(const BUrl& url); status_t InitCheck() const; @@ -179,9 +179,11 @@ private: void _Init(); void _UnInit(); - void _InitReader(BDataIO* source, BUrl* url = NULL, + void _InitReader(BDataIO* source, + const BUrl* url = NULL, int32 flags = 0); - void _InitWriter(BDataIO* target, BUrl* url, + void _InitWriter(BDataIO* target, + const BUrl* url, const media_file_format* fileFormat, int32 flags); diff --git a/headers/private/media/MediaExtractor.h b/headers/private/media/MediaExtractor.h index ede19737d1..ae8200d20c 100644 --- a/headers/private/media/MediaExtractor.h +++ b/headers/private/media/MediaExtractor.h @@ -40,7 +40,7 @@ struct stream_info { class MediaExtractor { public: MediaExtractor(BDataIO* source, int32 flags); - MediaExtractor(BUrl url, int32 flags); + MediaExtractor(const BUrl& url, int32 flags); ~MediaExtractor(); diff --git a/headers/private/media/StreamerPlugin.h b/headers/private/media/StreamerPlugin.h index ed3a5ac966..4fdfef5807 100644 --- a/headers/private/media/StreamerPlugin.h +++ b/headers/private/media/StreamerPlugin.h @@ -18,7 +18,7 @@ public: Streamer(); virtual ~Streamer(); - virtual status_t Sniff(BUrl url, BDataIO** source) = 0; + virtual status_t Sniff(const BUrl& url, BDataIO** source) = 0; private: virtual void _ReservedStreamer1(); virtual void _ReservedStreamer2(); diff --git a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp index dee0c1c7b0..eb49d88097 100644 --- a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp +++ b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp @@ -20,7 +20,7 @@ HTTPStreamer::~HTTPStreamer() status_t -HTTPStreamer::Sniff(BUrl url, BDataIO** source) +HTTPStreamer::Sniff(const BUrl& url, BDataIO** source) { HTTPMediaIO* ret = new HTTPMediaIO(url); if (ret->InitCheck() == B_OK) { diff --git a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h index 646bd918da..e044ec4692 100644 --- a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h +++ b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h @@ -14,7 +14,7 @@ public: HTTPStreamer(); virtual ~HTTPStreamer(); - virtual status_t Sniff(BUrl url, BDataIO** source); + virtual status_t Sniff(const BUrl& url, BDataIO** source); }; diff --git a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.cpp b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.cpp index 5eeee547f5..752426b85d 100644 --- a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.cpp +++ b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.cpp @@ -15,7 +15,7 @@ RTSPStreamer::~RTSPStreamer() status_t -RTSPStreamer::Sniff(BUrl url, BDataIO** source) +RTSPStreamer::Sniff(const BUrl& url, BDataIO** source) { RTSPMediaIO* ret = new RTSPMediaIO(url); if (ret->InitCheck() == B_OK) { diff --git a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h index a2d12c4e17..3bec1ae98a 100644 --- a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h +++ b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h @@ -9,7 +9,7 @@ public: RTSPStreamer(); virtual ~RTSPStreamer(); - virtual status_t Sniff(BUrl url, BDataIO** source); + virtual status_t Sniff(const BUrl& url, BDataIO** source); }; diff --git a/src/kits/media/MediaExtractor.cpp b/src/kits/media/MediaExtractor.cpp index 9be372bf99..154dd5047c 100644 --- a/src/kits/media/MediaExtractor.cpp +++ b/src/kits/media/MediaExtractor.cpp @@ -64,7 +64,7 @@ MediaExtractor::MediaExtractor(BDataIO* source, int32 flags) } -MediaExtractor::MediaExtractor(BUrl url, int32 flags) +MediaExtractor::MediaExtractor(const BUrl& url, int32 flags) : fExtractorThread(-1), fReader(NULL), diff --git a/src/kits/media/MediaFile.cpp b/src/kits/media/MediaFile.cpp index 4629e9e518..447ab3aea0 100644 --- a/src/kits/media/MediaFile.cpp +++ b/src/kits/media/MediaFile.cpp @@ -82,7 +82,7 @@ BMediaFile::BMediaFile(const media_file_format* mfi, int32 flags) } -BMediaFile::BMediaFile(BUrl url) +BMediaFile::BMediaFile(const BUrl& url) { CALLED(); fDeleteSource = true; @@ -91,7 +91,7 @@ BMediaFile::BMediaFile(BUrl url) } -BMediaFile::BMediaFile(BUrl url, int32 flags) +BMediaFile::BMediaFile(const BUrl& url, int32 flags) { CALLED(); fDeleteSource = true; @@ -471,7 +471,7 @@ BMediaFile::_UnInit() void -BMediaFile::_InitReader(BDataIO* source, BUrl* url, int32 flags) +BMediaFile::_InitReader(BDataIO* source, const BUrl* url, int32 flags) { CALLED(); @@ -512,7 +512,7 @@ BMediaFile::_InitReader(BDataIO* source, BUrl* url, int32 flags) void -BMediaFile::_InitWriter(BDataIO* target, BUrl* url, +BMediaFile::_InitWriter(BDataIO* target, const BUrl* url, const media_file_format* fileFormat, int32 flags) { CALLED();