diff --git a/include/f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp b/include/f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp index 0bf52f9..71b9696 100644 --- a/include/f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp @@ -42,7 +42,7 @@ public: void sendAVChannelSetupResponse(const proto::messages::AVChannelSetupResponse& response, SendPromise::Pointer promise) override; void sendAVInputOpenResponse(const proto::messages::AVInputOpenResponse& response, SendPromise::Pointer promise) override; void sendAVMediaWithTimestampIndication(messenger::Timestamp::ValueType, const common::Data& data, SendPromise::Pointer promise) override; - messenger::ChannelId getId() override; + messenger::ChannelId getId() const override; private: using std::enable_shared_from_this::shared_from_this; diff --git a/include/f1x/aasdk/Channel/AV/AudioServiceChannel.hpp b/include/f1x/aasdk/Channel/AV/AudioServiceChannel.hpp index 89abdf1..cbba4b3 100644 --- a/include/f1x/aasdk/Channel/AV/AudioServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/AV/AudioServiceChannel.hpp @@ -40,7 +40,7 @@ public: void sendChannelOpenResponse(const proto::messages::ChannelOpenResponse& response, SendPromise::Pointer promise) override; void sendAVChannelSetupResponse(const proto::messages::AVChannelSetupResponse& response, SendPromise::Pointer promise) override; void sendAVMediaAckIndication(const proto::messages::AVMediaAckIndication& indication, SendPromise::Pointer promise) override; - messenger::ChannelId getId() override; + messenger::ChannelId getId() const override; private: using std::enable_shared_from_this::shared_from_this; diff --git a/include/f1x/aasdk/Channel/AV/IAVInputServiceChannel.hpp b/include/f1x/aasdk/Channel/AV/IAVInputServiceChannel.hpp index 85ef26b..14319dd 100644 --- a/include/f1x/aasdk/Channel/AV/IAVInputServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/AV/IAVInputServiceChannel.hpp @@ -49,7 +49,7 @@ public: virtual void sendAVChannelSetupResponse(const proto::messages::AVChannelSetupResponse& response, SendPromise::Pointer promise) = 0; virtual void sendAVMediaWithTimestampIndication(messenger::Timestamp::ValueType, const common::Data& data, SendPromise::Pointer promise) = 0; virtual void sendAVInputOpenResponse(const proto::messages::AVInputOpenResponse& response, SendPromise::Pointer promise) = 0; - virtual messenger::ChannelId getId() = 0; + virtual messenger::ChannelId getId() const = 0; }; } diff --git a/include/f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp b/include/f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp index 61ffd25..99ad132 100644 --- a/include/f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp @@ -47,7 +47,7 @@ public: virtual void sendChannelOpenResponse(const proto::messages::ChannelOpenResponse& response, SendPromise::Pointer promise) = 0; virtual void sendAVChannelSetupResponse(const proto::messages::AVChannelSetupResponse& response, SendPromise::Pointer promise) = 0; virtual void sendAVMediaAckIndication(const proto::messages::AVMediaAckIndication& indication, SendPromise::Pointer promise) = 0; - virtual messenger::ChannelId getId() = 0; + virtual messenger::ChannelId getId() const = 0; }; } diff --git a/include/f1x/aasdk/Channel/AV/IVideoServiceChannel.hpp b/include/f1x/aasdk/Channel/AV/IVideoServiceChannel.hpp index 0432c94..3bc1c23 100644 --- a/include/f1x/aasdk/Channel/AV/IVideoServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/AV/IVideoServiceChannel.hpp @@ -49,7 +49,7 @@ public: virtual void sendAVChannelSetupResponse(const proto::messages::AVChannelSetupResponse& response, SendPromise::Pointer promise) = 0; virtual void sendVideoFocusIndication(const proto::messages::VideoFocusIndication& indication, SendPromise::Pointer promise) = 0; virtual void sendAVMediaAckIndication(const proto::messages::AVMediaAckIndication& indication, SendPromise::Pointer promise) = 0; - virtual messenger::ChannelId getId() = 0; + virtual messenger::ChannelId getId() const = 0; }; } diff --git a/include/f1x/aasdk/Channel/AV/VideoServiceChannel.hpp b/include/f1x/aasdk/Channel/AV/VideoServiceChannel.hpp index 4e05745..d1078a1 100644 --- a/include/f1x/aasdk/Channel/AV/VideoServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/AV/VideoServiceChannel.hpp @@ -40,7 +40,7 @@ public: void sendAVChannelSetupResponse(const proto::messages::AVChannelSetupResponse& response, SendPromise::Pointer promise) override; void sendVideoFocusIndication(const proto::messages::VideoFocusIndication& indication, SendPromise::Pointer promise) override; void sendAVMediaAckIndication(const proto::messages::AVMediaAckIndication& indication, SendPromise::Pointer promise) override; - messenger::ChannelId getId() override; + messenger::ChannelId getId() const override; private: using std::enable_shared_from_this::shared_from_this; diff --git a/include/f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp b/include/f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp index da5d6e4..ac714f4 100644 --- a/include/f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp @@ -36,7 +36,7 @@ public: BluetoothServiceChannel(boost::asio::io_service::strand& strand, messenger::IMessenger::Pointer messenger); void receive(IBluetoothServiceChannelEventHandler::Pointer eventHandler) override; - messenger::ChannelId getId() override; + messenger::ChannelId getId() const override; void sendChannelOpenResponse(const proto::messages::ChannelOpenResponse& response, SendPromise::Pointer promise) override; void sendBluetoothPairingResponse(const proto::messages::BluetoothPairingResponse& response, SendPromise::Pointer promise) override; diff --git a/include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp b/include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp index 4758a00..3f64c8a 100644 --- a/include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/Bluetooth/IBluetoothServiceChannel.hpp @@ -45,7 +45,7 @@ public: virtual void receive(IBluetoothServiceChannelEventHandler::Pointer eventHandler) = 0; virtual void sendChannelOpenResponse(const proto::messages::ChannelOpenResponse& response, SendPromise::Pointer promise) = 0; virtual void sendBluetoothPairingResponse(const proto::messages::BluetoothPairingResponse& response, SendPromise::Pointer promise) = 0; - virtual messenger::ChannelId getId() = 0; + virtual messenger::ChannelId getId() const = 0; }; } diff --git a/include/f1x/aasdk/Channel/Input/IInputServiceChannel.hpp b/include/f1x/aasdk/Channel/Input/IInputServiceChannel.hpp index 0d13cc2..8d67733 100644 --- a/include/f1x/aasdk/Channel/Input/IInputServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/Input/IInputServiceChannel.hpp @@ -48,7 +48,7 @@ public: virtual void sendChannelOpenResponse(const proto::messages::ChannelOpenResponse& response, SendPromise::Pointer promise) = 0; virtual void sendInputEventIndication(const proto::messages::InputEventIndication& indication, SendPromise::Pointer promise) = 0; virtual void sendBindingResponse(const proto::messages::BindingResponse& response, SendPromise::Pointer promise) = 0; - virtual messenger::ChannelId getId() = 0; + virtual messenger::ChannelId getId() const = 0; }; } diff --git a/include/f1x/aasdk/Channel/Input/InputServiceChannel.hpp b/include/f1x/aasdk/Channel/Input/InputServiceChannel.hpp index 42bfef3..dcb54c1 100644 --- a/include/f1x/aasdk/Channel/Input/InputServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/Input/InputServiceChannel.hpp @@ -39,7 +39,7 @@ class InputServiceChannel: public IInputServiceChannel, public ServiceChannel, p void sendChannelOpenResponse(const proto::messages::ChannelOpenResponse& response, SendPromise::Pointer promise) override; void sendInputEventIndication(const proto::messages::InputEventIndication& indication, SendPromise::Pointer promise) override; void sendBindingResponse(const proto::messages::BindingResponse& response, SendPromise::Pointer promise) override; - messenger::ChannelId getId() override; + messenger::ChannelId getId() const override; private: using std::enable_shared_from_this::shared_from_this; diff --git a/include/f1x/aasdk/Channel/Sensor/ISensorServiceChannel.hpp b/include/f1x/aasdk/Channel/Sensor/ISensorServiceChannel.hpp index 66400ee..f2ae4cb 100644 --- a/include/f1x/aasdk/Channel/Sensor/ISensorServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/Sensor/ISensorServiceChannel.hpp @@ -44,7 +44,7 @@ public: virtual ~ISensorServiceChannel() = default; virtual void receive(ISensorServiceChannelEventHandler::Pointer eventHandler) = 0; - virtual messenger::ChannelId getId() = 0; + virtual messenger::ChannelId getId() const = 0; virtual void sendChannelOpenResponse(const proto::messages::ChannelOpenResponse& response, SendPromise::Pointer promise) = 0; virtual void sendSensorEventIndication(const proto::messages::SensorEventIndication& indication, SendPromise::Pointer promise) = 0; virtual void sendSensorStartResponse(const proto::messages::SensorStartResponseMessage& response, SendPromise::Pointer promise) = 0; diff --git a/include/f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp b/include/f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp index 3cdd30b..62b4f1c 100644 --- a/include/f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp +++ b/include/f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp @@ -36,7 +36,7 @@ public: SensorServiceChannel(boost::asio::io_service::strand& strand, messenger::IMessenger::Pointer messenger); void receive(ISensorServiceChannelEventHandler::Pointer eventHandler) override; - messenger::ChannelId getId() override; + messenger::ChannelId getId() const override; void sendChannelOpenResponse(const proto::messages::ChannelOpenResponse& response, SendPromise::Pointer promise) override; void sendSensorEventIndication(const proto::messages::SensorEventIndication& indication, SendPromise::Pointer promise) override; void sendSensorStartResponse(const proto::messages::SensorStartResponseMessage& response, SendPromise::Pointer promise) override; diff --git a/src/Channel/AV/AVInputServiceChannel.cpp b/src/Channel/AV/AVInputServiceChannel.cpp index d18baa9..5deaa9f 100644 --- a/src/Channel/AV/AVInputServiceChannel.cpp +++ b/src/Channel/AV/AVInputServiceChannel.cpp @@ -65,7 +65,7 @@ void AVInputServiceChannel::sendAVChannelSetupResponse(const proto::messages::AV this->send(std::move(message), std::move(promise)); } -messenger::ChannelId AVInputServiceChannel::getId() +messenger::ChannelId AVInputServiceChannel::getId() const { return channelId_; } diff --git a/src/Channel/AV/AudioServiceChannel.cpp b/src/Channel/AV/AudioServiceChannel.cpp index e4e698a..f6f18dc 100644 --- a/src/Channel/AV/AudioServiceChannel.cpp +++ b/src/Channel/AV/AudioServiceChannel.cpp @@ -46,7 +46,7 @@ void AudioServiceChannel::receive(IAudioServiceChannelEventHandler::Pointer even messenger_->enqueueReceive(channelId_, std::move(receivePromise)); } -messenger::ChannelId AudioServiceChannel::getId() +messenger::ChannelId AudioServiceChannel::getId() const { return channelId_; } diff --git a/src/Channel/AV/VideoServiceChannel.cpp b/src/Channel/AV/VideoServiceChannel.cpp index c1dde6b..ea9997d 100644 --- a/src/Channel/AV/VideoServiceChannel.cpp +++ b/src/Channel/AV/VideoServiceChannel.cpp @@ -47,7 +47,7 @@ void VideoServiceChannel::receive(IVideoServiceChannelEventHandler::Pointer even messenger_->enqueueReceive(channelId_, std::move(receivePromise)); } -messenger::ChannelId VideoServiceChannel::getId() +messenger::ChannelId VideoServiceChannel::getId() const { return channelId_; } diff --git a/src/Channel/Bluetooth/BluetoothServiceChannel.cpp b/src/Channel/Bluetooth/BluetoothServiceChannel.cpp index 283a6f6..6d0b967 100644 --- a/src/Channel/Bluetooth/BluetoothServiceChannel.cpp +++ b/src/Channel/Bluetooth/BluetoothServiceChannel.cpp @@ -47,7 +47,7 @@ void BluetoothServiceChannel::receive(IBluetoothServiceChannelEventHandler::Poin messenger_->enqueueReceive(channelId_, std::move(receivePromise)); } -messenger::ChannelId BluetoothServiceChannel::getId() +messenger::ChannelId BluetoothServiceChannel::getId() const { return channelId_; } diff --git a/src/Channel/Input/InputServiceChannel.cpp b/src/Channel/Input/InputServiceChannel.cpp index f3073e7..05ca7b2 100644 --- a/src/Channel/Input/InputServiceChannel.cpp +++ b/src/Channel/Input/InputServiceChannel.cpp @@ -47,7 +47,7 @@ void InputServiceChannel::receive(IInputServiceChannelEventHandler::Pointer even messenger_->enqueueReceive(channelId_, std::move(receivePromise)); } -messenger::ChannelId InputServiceChannel::getId() +messenger::ChannelId InputServiceChannel::getId() const { return channelId_; } diff --git a/src/Channel/Sensor/SensorServiceChannel.cpp b/src/Channel/Sensor/SensorServiceChannel.cpp index 7ef7863..5ea151e 100644 --- a/src/Channel/Sensor/SensorServiceChannel.cpp +++ b/src/Channel/Sensor/SensorServiceChannel.cpp @@ -47,7 +47,7 @@ void SensorServiceChannel::receive(ISensorServiceChannelEventHandler::Pointer ev messenger_->enqueueReceive(channelId_, std::move(receivePromise)); } -messenger::ChannelId SensorServiceChannel::getId() +messenger::ChannelId SensorServiceChannel::getId() const { return channelId_; }