From 800672506958b8324bec087643a5830bc156ed72 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 28 Nov 2020 22:45:11 +0100 Subject: Avoid copying port IDs --- src/AlsaDriver.cpp | 4 ++-- src/AlsaDriver.hpp | 5 +++-- src/Driver.hpp | 5 +++-- src/JackDbusDriver.cpp | 4 ++-- src/JackDbusDriver.hpp | 5 +++-- src/JackDriver.cpp | 4 ++-- src/JackDriver.hpp | 5 +++-- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp index a417469..5228257 100644 --- a/src/AlsaDriver.cpp +++ b/src/AlsaDriver.cpp @@ -265,7 +265,7 @@ AlsaDriver::ignore(const snd_seq_addr_t& addr, bool add) } bool -AlsaDriver::connect(const PortID tail_id, const PortID head_id) +AlsaDriver::connect(const PortID& tail_id, const PortID& head_id) { if (tail_id.type() != PortID::Type::alsa || head_id.type() != PortID::Type::alsa) { @@ -319,7 +319,7 @@ AlsaDriver::connect(const PortID tail_id, const PortID head_id) } bool -AlsaDriver::disconnect(const PortID tail_id, const PortID head_id) +AlsaDriver::disconnect(const PortID& tail_id, const PortID& head_id) { if (tail_id.type() != PortID::Type::alsa || head_id.type() != PortID::Type::alsa) { diff --git a/src/AlsaDriver.hpp b/src/AlsaDriver.hpp index 1c57c02..0dd2008 100644 --- a/src/AlsaDriver.hpp +++ b/src/AlsaDriver.hpp @@ -47,8 +47,9 @@ public: void refresh(const EventSink& sink) override; - bool connect(PortID tail_id, PortID head_id) override; - bool disconnect(PortID tail_id, PortID head_id) override; + bool connect(const PortID& tail_id, const PortID& head_id) override; + + bool disconnect(const PortID& tail_id, const PortID& head_id) override; private: bool create_refresh_port(); diff --git a/src/Driver.hpp b/src/Driver.hpp index d85e5bc..fcd0b80 100644 --- a/src/Driver.hpp +++ b/src/Driver.hpp @@ -50,8 +50,9 @@ public: virtual void refresh(const EventSink& sink) = 0; - virtual bool connect(PortID tail_id, PortID head_id) = 0; - virtual bool disconnect(PortID tail_id, PortID head_id) = 0; + virtual bool connect(const PortID& tail_id, const PortID& head_id) = 0; + + virtual bool disconnect(const PortID& tail_id, const PortID& head_id) = 0; sigc::signal signal_attached; sigc::signal signal_detached; diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp index c40a149..6d59a9e 100644 --- a/src/JackDbusDriver.cpp +++ b/src/JackDbusDriver.cpp @@ -660,7 +660,7 @@ JackDriver::refresh(const EventSink& sink) } bool -JackDriver::connect(const PortID tail_id, const PortID head_id) +JackDriver::connect(const PortID& tail_id, const PortID& head_id) { const auto tail_names = PortNames(tail_id); const auto head_names = PortNames(head_id); @@ -692,7 +692,7 @@ JackDriver::connect(const PortID tail_id, const PortID head_id) } bool -JackDriver::disconnect(const PortID tail_id, const PortID head_id) +JackDriver::disconnect(const PortID& tail_id, const PortID& head_id) { const auto tail_names = PortNames(tail_id); const auto head_names = PortNames(head_id); diff --git a/src/JackDbusDriver.hpp b/src/JackDbusDriver.hpp index 9727fd6..99bd791 100644 --- a/src/JackDbusDriver.hpp +++ b/src/JackDbusDriver.hpp @@ -48,8 +48,9 @@ public: void refresh(const EventSink& sink) override; - bool connect(PortID tail_id, PortID head_id) override; - bool disconnect(PortID tail_id, PortID head_id) override; + bool connect(const PortID& tail_id, const PortID& head_id) override; + + bool disconnect(const PortID& tail_id, const PortID& head_id) override; uint32_t get_xruns(); void reset_xruns(); diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index e4bb52b..bfc8b8b 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -265,7 +265,7 @@ JackDriver::refresh(const EventSink& sink) } bool -JackDriver::connect(const PortID tail_id, const PortID head_id) +JackDriver::connect(const PortID& tail_id, const PortID& head_id) { if (!_client) { return false; @@ -289,7 +289,7 @@ JackDriver::connect(const PortID tail_id, const PortID head_id) } bool -JackDriver::disconnect(const PortID tail_id, const PortID head_id) +JackDriver::disconnect(const PortID& tail_id, const PortID& head_id) { if (!_client) { return false; diff --git a/src/JackDriver.hpp b/src/JackDriver.hpp index 1c9bc9e..b25722f 100644 --- a/src/JackDriver.hpp +++ b/src/JackDriver.hpp @@ -51,8 +51,9 @@ public: void refresh(const EventSink& sink) override; - bool connect(PortID tail_id, PortID head_id) override; - bool disconnect(PortID tail_id, PortID head_id) override; + bool connect(const PortID& tail_id, const PortID& head_id) override; + + bool disconnect(const PortID& tail_id, const PortID& head_id) override; uint32_t get_xruns() const { return _xruns; } void reset_xruns(); -- cgit v1.2.1