This commit is contained in:
@@ -9,8 +9,8 @@ namespace sp {
|
||||
|
||||
template <typename TMessageFactory>
|
||||
class MessageStream {
|
||||
private:
|
||||
std::vector<MessageEncapsulator> m_Encapsulators;
|
||||
protected:
|
||||
std::vector<std::shared_ptr<MessageEncapsulator>> m_Encapsulators;
|
||||
std::shared_ptr<IoInterface> m_Stream;
|
||||
|
||||
using MessageBaseType = typename TMessageFactory::MessageBaseType;
|
||||
@@ -19,11 +19,30 @@ class MessageStream {
|
||||
public:
|
||||
MessageStream(std::shared_ptr<IoInterface>&& a_Stream) : m_Stream(std::move(a_Stream)) {}
|
||||
|
||||
template<typename... TEnc>
|
||||
MessageStream(std::shared_ptr<IoInterface>&& a_Stream, TEnc&&... a_Encapsulators) :
|
||||
m_Stream(std::move(a_Stream)){
|
||||
m_Encapsulators.reserve(sizeof...(a_Encapsulators));
|
||||
AddEncapsulators(std::move(a_Encapsulators ...));
|
||||
}
|
||||
|
||||
std::unique_ptr<MessageBaseType> ReadMessage();
|
||||
std::unique_ptr<MessageBaseType> ReadMessage(MessageIdType a_Id);
|
||||
|
||||
void WriteMessage(const MessageBaseType& a_Message, bool a_WriteId = true);
|
||||
|
||||
template<typename... Args>
|
||||
void AddEncapsulators(Args&& ... a_Encapsulators) {
|
||||
AddEncapsulators(std::move(std::make_tuple<>(a_Encapsulators ...)));
|
||||
}
|
||||
|
||||
template<typename... Args>
|
||||
void AddEncapsulators(std::tuple<Args...>&& a_Encapsulators) {
|
||||
TupleForEach([this](auto&& a_Encapsulator){
|
||||
m_Encapsulators.push_back(std::move(a_Encapsulator));
|
||||
}, a_Encapsulators);
|
||||
}
|
||||
|
||||
private:
|
||||
DataBuffer ReadAndDecapsulate();
|
||||
std::unique_ptr<MessageBaseType> MakeMessage(DataBuffer& buffer, MessageIdType a_Id);
|
||||
|
||||
Reference in New Issue
Block a user