mirror of
https://github.com/badaix/snapcast.git
synced 2025-06-03 03:11:43 +02:00
add clang-format file
reformat code
This commit is contained in:
badaix
parent
b733f646ea
commit
b20add3815
105 changed files with 7773 additions and 7723 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -30,42 +30,39 @@ namespace msg
|
|||
class CodecHeader : public BaseMessage
|
||||
{
|
||||
public:
|
||||
CodecHeader(const std::string& codecName = "", size_t size = 0) : BaseMessage(message_type::kCodecHeader), payloadSize(size), codec(codecName)
|
||||
{
|
||||
payload = (char*)malloc(size);
|
||||
}
|
||||
CodecHeader(const std::string& codecName = "", size_t size = 0) : BaseMessage(message_type::kCodecHeader), payloadSize(size), codec(codecName)
|
||||
{
|
||||
payload = (char*)malloc(size);
|
||||
}
|
||||
|
||||
virtual ~CodecHeader()
|
||||
{
|
||||
free(payload);
|
||||
}
|
||||
virtual ~CodecHeader()
|
||||
{
|
||||
free(payload);
|
||||
}
|
||||
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
readVal(stream, codec);
|
||||
readVal(stream, &payload, payloadSize);
|
||||
}
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
readVal(stream, codec);
|
||||
readVal(stream, &payload, payloadSize);
|
||||
}
|
||||
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return sizeof(uint32_t) + codec.size() + sizeof(uint32_t) + payloadSize;
|
||||
}
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return sizeof(uint32_t) + codec.size() + sizeof(uint32_t) + payloadSize;
|
||||
}
|
||||
|
||||
uint32_t payloadSize;
|
||||
char* payload;
|
||||
std::string codec;
|
||||
uint32_t payloadSize;
|
||||
char* payload;
|
||||
std::string codec;
|
||||
|
||||
protected:
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, codec);
|
||||
writeVal(stream, payload, payloadSize);
|
||||
}
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, codec);
|
||||
writeVal(stream, payload, payloadSize);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -19,9 +19,9 @@
|
|||
#ifndef HELLO_MSG_H
|
||||
#define HELLO_MSG_H
|
||||
|
||||
#include "jsonMessage.h"
|
||||
#include "common/utils.h"
|
||||
#include "common/strCompat.h"
|
||||
#include "common/utils.h"
|
||||
#include "jsonMessage.h"
|
||||
#include <string>
|
||||
|
||||
|
||||
|
|
@ -31,87 +31,84 @@ namespace msg
|
|||
class Hello : public JsonMessage
|
||||
{
|
||||
public:
|
||||
Hello() : JsonMessage(message_type::kHello)
|
||||
{
|
||||
}
|
||||
Hello() : JsonMessage(message_type::kHello)
|
||||
{
|
||||
}
|
||||
|
||||
Hello(const std::string& macAddress, const std::string& id, size_t instance) : JsonMessage(message_type::kHello)
|
||||
{
|
||||
msg["MAC"] = macAddress;
|
||||
msg["HostName"] = ::getHostName();
|
||||
msg["Version"] = VERSION;
|
||||
msg["ClientName"] = "Snapclient";
|
||||
msg["OS"] = ::getOS();
|
||||
msg["Arch"] = ::getArch();
|
||||
msg["Instance"] = instance;
|
||||
msg["ID"] = id;
|
||||
msg["SnapStreamProtocolVersion"] = 2;
|
||||
}
|
||||
Hello(const std::string& macAddress, const std::string& id, size_t instance) : JsonMessage(message_type::kHello)
|
||||
{
|
||||
msg["MAC"] = macAddress;
|
||||
msg["HostName"] = ::getHostName();
|
||||
msg["Version"] = VERSION;
|
||||
msg["ClientName"] = "Snapclient";
|
||||
msg["OS"] = ::getOS();
|
||||
msg["Arch"] = ::getArch();
|
||||
msg["Instance"] = instance;
|
||||
msg["ID"] = id;
|
||||
msg["SnapStreamProtocolVersion"] = 2;
|
||||
}
|
||||
|
||||
virtual ~Hello()
|
||||
{
|
||||
}
|
||||
virtual ~Hello()
|
||||
{
|
||||
}
|
||||
|
||||
std::string getMacAddress() const
|
||||
{
|
||||
return msg["MAC"];
|
||||
}
|
||||
std::string getMacAddress() const
|
||||
{
|
||||
return msg["MAC"];
|
||||
}
|
||||
|
||||
std::string getHostName() const
|
||||
{
|
||||
return msg["HostName"];
|
||||
}
|
||||
std::string getHostName() const
|
||||
{
|
||||
return msg["HostName"];
|
||||
}
|
||||
|
||||
std::string getVersion() const
|
||||
{
|
||||
return msg["Version"];
|
||||
}
|
||||
std::string getVersion() const
|
||||
{
|
||||
return msg["Version"];
|
||||
}
|
||||
|
||||
std::string getClientName() const
|
||||
{
|
||||
return msg["ClientName"];
|
||||
}
|
||||
std::string getClientName() const
|
||||
{
|
||||
return msg["ClientName"];
|
||||
}
|
||||
|
||||
std::string getOS() const
|
||||
{
|
||||
return msg["OS"];
|
||||
}
|
||||
std::string getOS() const
|
||||
{
|
||||
return msg["OS"];
|
||||
}
|
||||
|
||||
std::string getArch() const
|
||||
{
|
||||
return msg["Arch"];
|
||||
}
|
||||
std::string getArch() const
|
||||
{
|
||||
return msg["Arch"];
|
||||
}
|
||||
|
||||
int getInstance() const
|
||||
{
|
||||
return get("Instance", 1);
|
||||
}
|
||||
int getInstance() const
|
||||
{
|
||||
return get("Instance", 1);
|
||||
}
|
||||
|
||||
int getProtocolVersion() const
|
||||
{
|
||||
return get("SnapStreamProtocolVersion", 1);
|
||||
}
|
||||
int getProtocolVersion() const
|
||||
{
|
||||
return get("SnapStreamProtocolVersion", 1);
|
||||
}
|
||||
|
||||
std::string getId() const
|
||||
{
|
||||
return get("ID", getMacAddress());
|
||||
}
|
||||
std::string getId() const
|
||||
{
|
||||
return get("ID", getMacAddress());
|
||||
}
|
||||
|
||||
std::string getUniqueId() const
|
||||
{
|
||||
std::string id = getId();
|
||||
int instance = getInstance();
|
||||
if (instance != 1)
|
||||
{
|
||||
id = id + "#" + cpt::to_string(instance);
|
||||
}
|
||||
return id;
|
||||
}
|
||||
std::string getUniqueId() const
|
||||
{
|
||||
std::string id = getId();
|
||||
int instance = getInstance();
|
||||
if (instance != 1)
|
||||
{
|
||||
id = id + "#" + cpt::to_string(instance);
|
||||
}
|
||||
return id;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -19,8 +19,8 @@
|
|||
#ifndef JSON_MESSAGE_H
|
||||
#define JSON_MESSAGE_H
|
||||
|
||||
#include "message.h"
|
||||
#include "common/json.hpp"
|
||||
#include "message.h"
|
||||
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
|
@ -32,54 +32,51 @@ namespace msg
|
|||
class JsonMessage : public BaseMessage
|
||||
{
|
||||
public:
|
||||
JsonMessage(message_type msgType) : BaseMessage(msgType)
|
||||
{
|
||||
}
|
||||
JsonMessage(message_type msgType) : BaseMessage(msgType)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~JsonMessage()
|
||||
{
|
||||
}
|
||||
virtual ~JsonMessage()
|
||||
{
|
||||
}
|
||||
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
std::string s;
|
||||
readVal(stream, s);
|
||||
msg = json::parse(s);
|
||||
}
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
std::string s;
|
||||
readVal(stream, s);
|
||||
msg = json::parse(s);
|
||||
}
|
||||
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return sizeof(uint32_t) + msg.dump().size();
|
||||
}
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return sizeof(uint32_t) + msg.dump().size();
|
||||
}
|
||||
|
||||
json msg;
|
||||
json msg;
|
||||
|
||||
|
||||
protected:
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, msg.dump());
|
||||
}
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, msg.dump());
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
T get(const std::string& what, const T& def) const
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!msg.count(what))
|
||||
return def;
|
||||
return msg[what].get<T>();
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
return def;
|
||||
}
|
||||
}
|
||||
template <typename T>
|
||||
T get(const std::string& what, const T& def) const
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!msg.count(what))
|
||||
return def;
|
||||
return msg[what].get<T>();
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
return def;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -19,92 +19,92 @@
|
|||
#ifndef MESSAGE_H
|
||||
#define MESSAGE_H
|
||||
|
||||
#include "common/endian.hpp"
|
||||
#include "common/timeDefs.h"
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <streambuf>
|
||||
#include <vector>
|
||||
#include <sys/time.h>
|
||||
#include "common/endian.hpp"
|
||||
#include "common/timeDefs.h"
|
||||
#include <vector>
|
||||
|
||||
/*
|
||||
template<typename CharT, typename TraitsT = std::char_traits<CharT> >
|
||||
class vectorwrapbuf : public std::basic_streambuf<CharT, TraitsT>
|
||||
{
|
||||
public:
|
||||
vectorwrapbuf(std::vector<CharT> &vec)
|
||||
{
|
||||
this->setg(vec.data(), vec.data(), vec.data() + vec.size());
|
||||
}
|
||||
vectorwrapbuf(std::vector<CharT> &vec)
|
||||
{
|
||||
this->setg(vec.data(), vec.data(), vec.data() + vec.size());
|
||||
}
|
||||
};
|
||||
*/
|
||||
|
||||
struct membuf : public std::basic_streambuf<char>
|
||||
{
|
||||
membuf(char* begin, char* end)
|
||||
{
|
||||
this->setg(begin, begin, end);
|
||||
}
|
||||
membuf(char* begin, char* end)
|
||||
{
|
||||
this->setg(begin, begin, end);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
enum message_type
|
||||
{
|
||||
kBase = 0,
|
||||
kCodecHeader = 1,
|
||||
kWireChunk = 2,
|
||||
kServerSettings = 3,
|
||||
kTime = 4,
|
||||
kHello = 5,
|
||||
kStreamTags = 6,
|
||||
kBase = 0,
|
||||
kCodecHeader = 1,
|
||||
kWireChunk = 2,
|
||||
kServerSettings = 3,
|
||||
kTime = 4,
|
||||
kHello = 5,
|
||||
kStreamTags = 6,
|
||||
|
||||
kFirst = kBase,
|
||||
kLast = kStreamTags
|
||||
kFirst = kBase,
|
||||
kLast = kStreamTags
|
||||
};
|
||||
|
||||
|
||||
|
||||
struct tv
|
||||
{
|
||||
tv()
|
||||
{
|
||||
timeval t;
|
||||
chronos::systemtimeofday(&t);
|
||||
sec = t.tv_sec;
|
||||
usec = t.tv_usec;
|
||||
}
|
||||
tv(timeval tv) : sec(tv.tv_sec), usec(tv.tv_usec) {};
|
||||
tv(int32_t _sec, int32_t _usec) : sec(_sec), usec(_usec) {};
|
||||
tv()
|
||||
{
|
||||
timeval t;
|
||||
chronos::systemtimeofday(&t);
|
||||
sec = t.tv_sec;
|
||||
usec = t.tv_usec;
|
||||
}
|
||||
tv(timeval tv) : sec(tv.tv_sec), usec(tv.tv_usec){};
|
||||
tv(int32_t _sec, int32_t _usec) : sec(_sec), usec(_usec){};
|
||||
|
||||
int32_t sec;
|
||||
int32_t usec;
|
||||
int32_t sec;
|
||||
int32_t usec;
|
||||
|
||||
tv operator+(const tv& other) const
|
||||
{
|
||||
tv result(*this);
|
||||
result.sec += other.sec;
|
||||
result.usec += other.usec;
|
||||
if (result.usec > 1000000)
|
||||
{
|
||||
result.sec += result.usec / 1000000;
|
||||
result.usec %= 1000000;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
tv operator+(const tv& other) const
|
||||
{
|
||||
tv result(*this);
|
||||
result.sec += other.sec;
|
||||
result.usec += other.usec;
|
||||
if (result.usec > 1000000)
|
||||
{
|
||||
result.sec += result.usec / 1000000;
|
||||
result.usec %= 1000000;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
tv operator-(const tv& other) const
|
||||
{
|
||||
tv result(*this);
|
||||
result.sec -= other.sec;
|
||||
result.usec -= other.usec;
|
||||
while (result.usec < 0)
|
||||
{
|
||||
result.sec -= 1;
|
||||
result.usec += 1000000;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
tv operator-(const tv& other) const
|
||||
{
|
||||
tv result(*this);
|
||||
result.sec -= other.sec;
|
||||
result.usec -= other.usec;
|
||||
while (result.usec < 0)
|
||||
{
|
||||
result.sec -= 1;
|
||||
result.usec += 1000000;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
namespace msg
|
||||
|
|
@ -118,197 +118,192 @@ using message_ptr = std::shared_ptr<msg::BaseMessage>;
|
|||
|
||||
struct BaseMessage
|
||||
{
|
||||
BaseMessage() : type(kBase), id(0), refersTo(0)
|
||||
{
|
||||
}
|
||||
BaseMessage() : type(kBase), id(0), refersTo(0)
|
||||
{
|
||||
}
|
||||
|
||||
BaseMessage(message_type type_) : type(type_), id(0), refersTo(0)
|
||||
{
|
||||
}
|
||||
BaseMessage(message_type type_) : type(type_), id(0), refersTo(0)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~BaseMessage()
|
||||
{
|
||||
}
|
||||
virtual ~BaseMessage()
|
||||
{
|
||||
}
|
||||
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
readVal(stream, type);
|
||||
readVal(stream, id);
|
||||
readVal(stream, refersTo);
|
||||
readVal(stream, sent.sec);
|
||||
readVal(stream, sent.usec);
|
||||
readVal(stream, received.sec);
|
||||
readVal(stream, received.usec);
|
||||
readVal(stream, size);
|
||||
}
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
readVal(stream, type);
|
||||
readVal(stream, id);
|
||||
readVal(stream, refersTo);
|
||||
readVal(stream, sent.sec);
|
||||
readVal(stream, sent.usec);
|
||||
readVal(stream, received.sec);
|
||||
readVal(stream, received.usec);
|
||||
readVal(stream, size);
|
||||
}
|
||||
|
||||
void deserialize(char* payload)
|
||||
{
|
||||
membuf databuf(payload, payload + BaseMessage::getSize());
|
||||
std::istream is(&databuf);
|
||||
read(is);
|
||||
}
|
||||
void deserialize(char* payload)
|
||||
{
|
||||
membuf databuf(payload, payload + BaseMessage::getSize());
|
||||
std::istream is(&databuf);
|
||||
read(is);
|
||||
}
|
||||
|
||||
void deserialize(const BaseMessage& baseMessage, char* payload)
|
||||
{
|
||||
type = baseMessage.type;
|
||||
id = baseMessage.id;
|
||||
refersTo = baseMessage.refersTo;
|
||||
sent = baseMessage.sent;
|
||||
received = baseMessage.received;
|
||||
size = baseMessage.size;
|
||||
membuf databuf(payload, payload + size);
|
||||
std::istream is(&databuf);
|
||||
read(is);
|
||||
}
|
||||
void deserialize(const BaseMessage& baseMessage, char* payload)
|
||||
{
|
||||
type = baseMessage.type;
|
||||
id = baseMessage.id;
|
||||
refersTo = baseMessage.refersTo;
|
||||
sent = baseMessage.sent;
|
||||
received = baseMessage.received;
|
||||
size = baseMessage.size;
|
||||
membuf databuf(payload, payload + size);
|
||||
std::istream is(&databuf);
|
||||
read(is);
|
||||
}
|
||||
|
||||
virtual void serialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, type);
|
||||
writeVal(stream, id);
|
||||
writeVal(stream, refersTo);
|
||||
writeVal(stream, sent.sec);
|
||||
writeVal(stream, sent.usec);
|
||||
writeVal(stream, received.sec);
|
||||
writeVal(stream, received.usec);
|
||||
size = getSize();
|
||||
writeVal(stream, size);
|
||||
doserialize(stream);
|
||||
}
|
||||
virtual void serialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, type);
|
||||
writeVal(stream, id);
|
||||
writeVal(stream, refersTo);
|
||||
writeVal(stream, sent.sec);
|
||||
writeVal(stream, sent.usec);
|
||||
writeVal(stream, received.sec);
|
||||
writeVal(stream, received.usec);
|
||||
size = getSize();
|
||||
writeVal(stream, size);
|
||||
doserialize(stream);
|
||||
}
|
||||
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return 3*sizeof(uint16_t) + 2*sizeof(tv) + sizeof(uint32_t);
|
||||
};
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return 3 * sizeof(uint16_t) + 2 * sizeof(tv) + sizeof(uint32_t);
|
||||
};
|
||||
|
||||
uint16_t type;
|
||||
mutable uint16_t id;
|
||||
uint16_t refersTo;
|
||||
tv received;
|
||||
mutable tv sent;
|
||||
mutable uint32_t size;
|
||||
uint16_t type;
|
||||
mutable uint16_t id;
|
||||
uint16_t refersTo;
|
||||
tv received;
|
||||
mutable tv sent;
|
||||
mutable uint32_t size;
|
||||
|
||||
protected:
|
||||
void writeVal(std::ostream& stream, const bool& val) const
|
||||
{
|
||||
char c = val?1:0;
|
||||
writeVal(stream, c);
|
||||
}
|
||||
void writeVal(std::ostream& stream, const bool& val) const
|
||||
{
|
||||
char c = val ? 1 : 0;
|
||||
writeVal(stream, c);
|
||||
}
|
||||
|
||||
void writeVal(std::ostream& stream, const char& val) const
|
||||
{
|
||||
stream.write(reinterpret_cast<const char*>(&val), sizeof(char));
|
||||
}
|
||||
void writeVal(std::ostream& stream, const char& val) const
|
||||
{
|
||||
stream.write(reinterpret_cast<const char*>(&val), sizeof(char));
|
||||
}
|
||||
|
||||
void writeVal(std::ostream& stream, const uint16_t& val) const
|
||||
{
|
||||
uint16_t v = SWAP_16(val);
|
||||
stream.write(reinterpret_cast<const char*>(&v), sizeof(uint16_t));
|
||||
}
|
||||
void writeVal(std::ostream& stream, const uint16_t& val) const
|
||||
{
|
||||
uint16_t v = SWAP_16(val);
|
||||
stream.write(reinterpret_cast<const char*>(&v), sizeof(uint16_t));
|
||||
}
|
||||
|
||||
void writeVal(std::ostream& stream, const int16_t& val) const
|
||||
{
|
||||
uint16_t v = SWAP_16(val);
|
||||
stream.write(reinterpret_cast<const char*>(&v), sizeof(int16_t));
|
||||
}
|
||||
void writeVal(std::ostream& stream, const int16_t& val) const
|
||||
{
|
||||
uint16_t v = SWAP_16(val);
|
||||
stream.write(reinterpret_cast<const char*>(&v), sizeof(int16_t));
|
||||
}
|
||||
|
||||
void writeVal(std::ostream& stream, const uint32_t& val) const
|
||||
{
|
||||
uint32_t v = SWAP_32(val);
|
||||
stream.write(reinterpret_cast<const char*>(&v), sizeof(uint32_t));
|
||||
}
|
||||
void writeVal(std::ostream& stream, const uint32_t& val) const
|
||||
{
|
||||
uint32_t v = SWAP_32(val);
|
||||
stream.write(reinterpret_cast<const char*>(&v), sizeof(uint32_t));
|
||||
}
|
||||
|
||||
void writeVal(std::ostream& stream, const int32_t& val) const
|
||||
{
|
||||
uint32_t v = SWAP_32(val);
|
||||
stream.write(reinterpret_cast<const char*>(&v), sizeof(int32_t));
|
||||
}
|
||||
void writeVal(std::ostream& stream, const int32_t& val) const
|
||||
{
|
||||
uint32_t v = SWAP_32(val);
|
||||
stream.write(reinterpret_cast<const char*>(&v), sizeof(int32_t));
|
||||
}
|
||||
|
||||
void writeVal(std::ostream& stream, const char* payload, const uint32_t& size) const
|
||||
{
|
||||
writeVal(stream, size);
|
||||
stream.write(payload, size);
|
||||
}
|
||||
void writeVal(std::ostream& stream, const char* payload, const uint32_t& size) const
|
||||
{
|
||||
writeVal(stream, size);
|
||||
stream.write(payload, size);
|
||||
}
|
||||
|
||||
void writeVal(std::ostream& stream, const std::string& val) const
|
||||
{
|
||||
uint32_t size = val.size();
|
||||
writeVal(stream, val.c_str(), size);
|
||||
}
|
||||
void writeVal(std::ostream& stream, const std::string& val) const
|
||||
{
|
||||
uint32_t size = val.size();
|
||||
writeVal(stream, val.c_str(), size);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void readVal(std::istream& stream, bool& val) const
|
||||
{
|
||||
char c;
|
||||
readVal(stream, c);
|
||||
val = (c != 0);
|
||||
}
|
||||
void readVal(std::istream& stream, bool& val) const
|
||||
{
|
||||
char c;
|
||||
readVal(stream, c);
|
||||
val = (c != 0);
|
||||
}
|
||||
|
||||
void readVal(std::istream& stream, char& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(char));
|
||||
}
|
||||
void readVal(std::istream& stream, char& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(char));
|
||||
}
|
||||
|
||||
void readVal(std::istream& stream, uint16_t& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(uint16_t));
|
||||
val = SWAP_16(val);
|
||||
}
|
||||
void readVal(std::istream& stream, uint16_t& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(uint16_t));
|
||||
val = SWAP_16(val);
|
||||
}
|
||||
|
||||
void readVal(std::istream& stream, int16_t& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(int16_t));
|
||||
val = SWAP_16(val);
|
||||
}
|
||||
void readVal(std::istream& stream, int16_t& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(int16_t));
|
||||
val = SWAP_16(val);
|
||||
}
|
||||
|
||||
void readVal(std::istream& stream, uint32_t& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(uint32_t));
|
||||
val = SWAP_32(val);
|
||||
}
|
||||
void readVal(std::istream& stream, uint32_t& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(uint32_t));
|
||||
val = SWAP_32(val);
|
||||
}
|
||||
|
||||
void readVal(std::istream& stream, int32_t& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(int32_t));
|
||||
val = SWAP_32(val);
|
||||
}
|
||||
void readVal(std::istream& stream, int32_t& val) const
|
||||
{
|
||||
stream.read(reinterpret_cast<char*>(&val), sizeof(int32_t));
|
||||
val = SWAP_32(val);
|
||||
}
|
||||
|
||||
void readVal(std::istream& stream, char** payload, uint32_t& size) const
|
||||
{
|
||||
readVal(stream, size);
|
||||
*payload = (char*)realloc(*payload, size);
|
||||
stream.read(*payload, size);
|
||||
}
|
||||
void readVal(std::istream& stream, char** payload, uint32_t& size) const
|
||||
{
|
||||
readVal(stream, size);
|
||||
*payload = (char*)realloc(*payload, size);
|
||||
stream.read(*payload, size);
|
||||
}
|
||||
|
||||
void readVal(std::istream& stream, std::string& val) const
|
||||
{
|
||||
uint32_t size;
|
||||
readVal(stream, size);
|
||||
val.resize(size);
|
||||
stream.read(&val[0], size);
|
||||
}
|
||||
void readVal(std::istream& stream, std::string& val) const
|
||||
{
|
||||
uint32_t size;
|
||||
readVal(stream, size);
|
||||
val.resize(size);
|
||||
stream.read(&val[0], size);
|
||||
}
|
||||
|
||||
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
};
|
||||
virtual void doserialize(std::ostream& stream) const {};
|
||||
};
|
||||
|
||||
|
||||
struct SerializedMessage
|
||||
{
|
||||
~SerializedMessage()
|
||||
{
|
||||
free(buffer);
|
||||
}
|
||||
~SerializedMessage()
|
||||
{
|
||||
free(buffer);
|
||||
}
|
||||
|
||||
BaseMessage message;
|
||||
char* buffer;
|
||||
BaseMessage message;
|
||||
char* buffer;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -19,10 +19,10 @@
|
|||
#ifndef PCM_CHUNK_H
|
||||
#define PCM_CHUNK_H
|
||||
|
||||
#include <chrono>
|
||||
#include "common/sampleFormat.h"
|
||||
#include "message.h"
|
||||
#include "wireChunk.h"
|
||||
#include "common/sampleFormat.h"
|
||||
#include <chrono>
|
||||
|
||||
|
||||
namespace msg
|
||||
|
|
@ -36,106 +36,95 @@ namespace msg
|
|||
class PcmChunk : public WireChunk
|
||||
{
|
||||
public:
|
||||
PcmChunk(const SampleFormat& sampleFormat, size_t ms) :
|
||||
WireChunk(sampleFormat.rate*sampleFormat.frameSize*ms / 1000),
|
||||
format(sampleFormat),
|
||||
idx_(0)
|
||||
{
|
||||
}
|
||||
PcmChunk(const SampleFormat& sampleFormat, size_t ms) : WireChunk(sampleFormat.rate * sampleFormat.frameSize * ms / 1000), format(sampleFormat), idx_(0)
|
||||
{
|
||||
}
|
||||
|
||||
PcmChunk(const PcmChunk& pcmChunk) :
|
||||
WireChunk(pcmChunk),
|
||||
format(pcmChunk.format),
|
||||
idx_(0)
|
||||
{
|
||||
}
|
||||
PcmChunk(const PcmChunk& pcmChunk) : WireChunk(pcmChunk), format(pcmChunk.format), idx_(0)
|
||||
{
|
||||
}
|
||||
|
||||
PcmChunk() : WireChunk(), idx_(0)
|
||||
{
|
||||
}
|
||||
PcmChunk() : WireChunk(), idx_(0)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~PcmChunk()
|
||||
{
|
||||
}
|
||||
virtual ~PcmChunk()
|
||||
{
|
||||
}
|
||||
|
||||
int readFrames(void* outputBuffer, size_t frameCount)
|
||||
{
|
||||
//logd << "read: " << frameCount << ", total: " << (wireChunk->length / format.frameSize) << ", idx: " << idx;// << std::endl;
|
||||
int result = frameCount;
|
||||
if (idx_ + frameCount > (payloadSize / format.frameSize))
|
||||
result = (payloadSize / format.frameSize) - idx_;
|
||||
int readFrames(void* outputBuffer, size_t frameCount)
|
||||
{
|
||||
// logd << "read: " << frameCount << ", total: " << (wireChunk->length / format.frameSize) << ", idx: " << idx;// << std::endl;
|
||||
int result = frameCount;
|
||||
if (idx_ + frameCount > (payloadSize / format.frameSize))
|
||||
result = (payloadSize / format.frameSize) - idx_;
|
||||
|
||||
//logd << ", from: " << format.frameSize*idx << ", to: " << format.frameSize*idx + format.frameSize*result;
|
||||
if (outputBuffer != NULL)
|
||||
memcpy((char*)outputBuffer, (char*)(payload) + format.frameSize*idx_, format.frameSize*result);
|
||||
// logd << ", from: " << format.frameSize*idx << ", to: " << format.frameSize*idx + format.frameSize*result;
|
||||
if (outputBuffer != NULL)
|
||||
memcpy((char*)outputBuffer, (char*)(payload) + format.frameSize * idx_, format.frameSize * result);
|
||||
|
||||
idx_ += result;
|
||||
//logd << ", new idx: " << idx << ", result: " << result << ", wireChunk->length: " << wireChunk->length << ", format.frameSize: " << format.frameSize << "\n";//std::endl;
|
||||
return result;
|
||||
}
|
||||
|
||||
int seek(int frames)
|
||||
{
|
||||
if ((frames < 0) && (-frames > (int)idx_))
|
||||
frames = -idx_;
|
||||
|
||||
idx_ += frames;
|
||||
if (idx_ > getFrameCount())
|
||||
idx_ = getFrameCount();
|
||||
idx_ += result;
|
||||
// logd << ", new idx: " << idx << ", result: " << result << ", wireChunk->length: " << wireChunk->length << ", format.frameSize: " << format.frameSize
|
||||
// << "\n";//std::endl;
|
||||
return result;
|
||||
}
|
||||
|
||||
return idx_;
|
||||
}
|
||||
int seek(int frames)
|
||||
{
|
||||
if ((frames < 0) && (-frames > (int)idx_))
|
||||
frames = -idx_;
|
||||
|
||||
idx_ += frames;
|
||||
if (idx_ > getFrameCount())
|
||||
idx_ = getFrameCount();
|
||||
|
||||
return idx_;
|
||||
}
|
||||
|
||||
|
||||
virtual chronos::time_point_clk start() const
|
||||
{
|
||||
return chronos::time_point_clk(
|
||||
chronos::sec(timestamp.sec) +
|
||||
chronos::usec(timestamp.usec) +
|
||||
chronos::usec((chronos::usec::rep)(1000000. * ((double)idx_ / (double)format.rate)))
|
||||
);
|
||||
}
|
||||
virtual chronos::time_point_clk start() const
|
||||
{
|
||||
return chronos::time_point_clk(chronos::sec(timestamp.sec) + chronos::usec(timestamp.usec) +
|
||||
chronos::usec((chronos::usec::rep)(1000000. * ((double)idx_ / (double)format.rate))));
|
||||
}
|
||||
|
||||
inline chronos::time_point_clk end() const
|
||||
{
|
||||
return start() + durationLeft<chronos::usec>();
|
||||
}
|
||||
inline chronos::time_point_clk end() const
|
||||
{
|
||||
return start() + durationLeft<chronos::usec>();
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
inline T duration() const
|
||||
{
|
||||
return std::chrono::duration_cast<T>(chronos::nsec((chronos::nsec::rep)(1000000 * getFrameCount() / format.msRate())));
|
||||
}
|
||||
template <typename T>
|
||||
inline T duration() const
|
||||
{
|
||||
return std::chrono::duration_cast<T>(chronos::nsec((chronos::nsec::rep)(1000000 * getFrameCount() / format.msRate())));
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
inline T durationLeft() const
|
||||
{
|
||||
return std::chrono::duration_cast<T>(chronos::nsec((chronos::nsec::rep)(1000000 * (getFrameCount() - idx_) / format.msRate())));
|
||||
}
|
||||
template <typename T>
|
||||
inline T durationLeft() const
|
||||
{
|
||||
return std::chrono::duration_cast<T>(chronos::nsec((chronos::nsec::rep)(1000000 * (getFrameCount() - idx_) / format.msRate())));
|
||||
}
|
||||
|
||||
inline bool isEndOfChunk() const
|
||||
{
|
||||
return idx_ >= getFrameCount();
|
||||
}
|
||||
inline bool isEndOfChunk() const
|
||||
{
|
||||
return idx_ >= getFrameCount();
|
||||
}
|
||||
|
||||
inline size_t getFrameCount() const
|
||||
{
|
||||
return (payloadSize / format.frameSize);
|
||||
}
|
||||
inline size_t getFrameCount() const
|
||||
{
|
||||
return (payloadSize / format.frameSize);
|
||||
}
|
||||
|
||||
inline size_t getSampleCount() const
|
||||
{
|
||||
return (payloadSize / format.sampleSize);
|
||||
}
|
||||
inline size_t getSampleCount() const
|
||||
{
|
||||
return (payloadSize / format.sampleSize);
|
||||
}
|
||||
|
||||
SampleFormat format;
|
||||
SampleFormat format;
|
||||
|
||||
private:
|
||||
uint32_t idx_;
|
||||
uint32_t idx_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -28,64 +28,61 @@ namespace msg
|
|||
class ServerSettings : public JsonMessage
|
||||
{
|
||||
public:
|
||||
ServerSettings() : JsonMessage(message_type::kServerSettings)
|
||||
{
|
||||
setBufferMs(0);
|
||||
setLatency(0);
|
||||
setVolume(100);
|
||||
setMuted(false);
|
||||
}
|
||||
ServerSettings() : JsonMessage(message_type::kServerSettings)
|
||||
{
|
||||
setBufferMs(0);
|
||||
setLatency(0);
|
||||
setVolume(100);
|
||||
setMuted(false);
|
||||
}
|
||||
|
||||
virtual ~ServerSettings()
|
||||
{
|
||||
}
|
||||
virtual ~ServerSettings()
|
||||
{
|
||||
}
|
||||
|
||||
int32_t getBufferMs()
|
||||
{
|
||||
return get("bufferMs", 0);
|
||||
}
|
||||
int32_t getBufferMs()
|
||||
{
|
||||
return get("bufferMs", 0);
|
||||
}
|
||||
|
||||
int32_t getLatency()
|
||||
{
|
||||
return get("latency", 0);
|
||||
}
|
||||
int32_t getLatency()
|
||||
{
|
||||
return get("latency", 0);
|
||||
}
|
||||
|
||||
uint16_t getVolume()
|
||||
{
|
||||
return get("volume", 100);
|
||||
}
|
||||
uint16_t getVolume()
|
||||
{
|
||||
return get("volume", 100);
|
||||
}
|
||||
|
||||
bool isMuted()
|
||||
{
|
||||
return get("muted", false);
|
||||
}
|
||||
bool isMuted()
|
||||
{
|
||||
return get("muted", false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void setBufferMs(int32_t bufferMs)
|
||||
{
|
||||
msg["bufferMs"] = bufferMs;
|
||||
}
|
||||
void setBufferMs(int32_t bufferMs)
|
||||
{
|
||||
msg["bufferMs"] = bufferMs;
|
||||
}
|
||||
|
||||
void setLatency(int32_t latency)
|
||||
{
|
||||
msg["latency"] = latency;
|
||||
}
|
||||
void setLatency(int32_t latency)
|
||||
{
|
||||
msg["latency"] = latency;
|
||||
}
|
||||
|
||||
void setVolume(uint16_t volume)
|
||||
{
|
||||
msg["volume"] = volume;
|
||||
}
|
||||
void setVolume(uint16_t volume)
|
||||
{
|
||||
msg["volume"] = volume;
|
||||
}
|
||||
|
||||
void setMuted(bool muted)
|
||||
{
|
||||
msg["muted"] = muted;
|
||||
}
|
||||
void setMuted(bool muted)
|
||||
{
|
||||
msg["muted"] = muted;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -24,12 +24,12 @@
|
|||
/*
|
||||
* Due to the PCM pipe implementation of snapcast input we cannot know track start/end
|
||||
* it's all a long stream (although we detect idle situations)
|
||||
*
|
||||
*
|
||||
* So, we cannot push metadata on start of track as we don't know when that is.
|
||||
*
|
||||
*
|
||||
* I.E. we push metadata as we get an update, as we don't know when an update
|
||||
* is complete (different meta supported in different stream interfaces)
|
||||
* it is the streamreaders responsibility to update metadata and
|
||||
* it is the streamreaders responsibility to update metadata and
|
||||
* trigger a client notification.
|
||||
*
|
||||
* I.E. we need to suppply the client notification mechanism.
|
||||
|
|
@ -41,38 +41,35 @@ namespace msg
|
|||
class StreamTags : public JsonMessage
|
||||
{
|
||||
public:
|
||||
/*
|
||||
Usage:
|
||||
json jtag = {
|
||||
{"artist", "Pink Floyd"},
|
||||
{"album", "Dark Side of the Moon"},
|
||||
{"track", "Money"},
|
||||
{"spotifyid", "akjhasi7wehke7698"},
|
||||
{"musicbrainzid", "akjhasi7wehke7698"},
|
||||
};
|
||||
this->meta_.reset(new msg::StreamTags(jtag));
|
||||
/*
|
||||
Usage:
|
||||
json jtag = {
|
||||
{"artist", "Pink Floyd"},
|
||||
{"album", "Dark Side of the Moon"},
|
||||
{"track", "Money"},
|
||||
{"spotifyid", "akjhasi7wehke7698"},
|
||||
{"musicbrainzid", "akjhasi7wehke7698"},
|
||||
};
|
||||
this->meta_.reset(new msg::StreamTags(jtag));
|
||||
|
||||
Stream input can decide on tags, IDK... but smart
|
||||
to use some common naming scheme
|
||||
*/
|
||||
Stream input can decide on tags, IDK... but smart
|
||||
to use some common naming scheme
|
||||
*/
|
||||
|
||||
StreamTags(json j) : JsonMessage(message_type::kStreamTags)
|
||||
{
|
||||
msg = j;
|
||||
}
|
||||
StreamTags(json j) : JsonMessage(message_type::kStreamTags)
|
||||
{
|
||||
msg = j;
|
||||
}
|
||||
|
||||
StreamTags() : JsonMessage(message_type::kStreamTags)
|
||||
{
|
||||
}
|
||||
StreamTags() : JsonMessage(message_type::kStreamTags)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~StreamTags()
|
||||
{
|
||||
}
|
||||
virtual ~StreamTags()
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -27,38 +27,35 @@ namespace msg
|
|||
class Time : public BaseMessage
|
||||
{
|
||||
public:
|
||||
Time() : BaseMessage(message_type::kTime)
|
||||
{
|
||||
}
|
||||
Time() : BaseMessage(message_type::kTime)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~Time()
|
||||
{
|
||||
}
|
||||
virtual ~Time()
|
||||
{
|
||||
}
|
||||
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
readVal(stream, latency.sec);
|
||||
readVal(stream, latency.usec);
|
||||
}
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
readVal(stream, latency.sec);
|
||||
readVal(stream, latency.usec);
|
||||
}
|
||||
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return sizeof(tv);
|
||||
}
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return sizeof(tv);
|
||||
}
|
||||
|
||||
tv latency;
|
||||
tv latency;
|
||||
|
||||
protected:
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, latency.sec);
|
||||
writeVal(stream, latency.usec);
|
||||
}
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, latency.sec);
|
||||
writeVal(stream, latency.usec);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -19,14 +19,14 @@
|
|||
#ifndef WIRE_CHUNK_H
|
||||
#define WIRE_CHUNK_H
|
||||
|
||||
#include "common/timeDefs.h"
|
||||
#include "message.h"
|
||||
#include <chrono>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <streambuf>
|
||||
#include <vector>
|
||||
#include "message.h"
|
||||
#include "common/timeDefs.h"
|
||||
|
||||
|
||||
namespace msg
|
||||
|
|
@ -39,55 +39,52 @@ namespace msg
|
|||
class WireChunk : public BaseMessage
|
||||
{
|
||||
public:
|
||||
WireChunk(size_t size = 0) : BaseMessage(message_type::kWireChunk), payloadSize(size)
|
||||
{
|
||||
payload = (char*)malloc(size);
|
||||
}
|
||||
WireChunk(size_t size = 0) : BaseMessage(message_type::kWireChunk), payloadSize(size)
|
||||
{
|
||||
payload = (char*)malloc(size);
|
||||
}
|
||||
|
||||
WireChunk(const WireChunk& wireChunk) : BaseMessage(message_type::kWireChunk), timestamp(wireChunk.timestamp), payloadSize(wireChunk.payloadSize)
|
||||
{
|
||||
payload = (char*)malloc(payloadSize);
|
||||
memcpy(payload, wireChunk.payload, payloadSize);
|
||||
}
|
||||
WireChunk(const WireChunk& wireChunk) : BaseMessage(message_type::kWireChunk), timestamp(wireChunk.timestamp), payloadSize(wireChunk.payloadSize)
|
||||
{
|
||||
payload = (char*)malloc(payloadSize);
|
||||
memcpy(payload, wireChunk.payload, payloadSize);
|
||||
}
|
||||
|
||||
virtual ~WireChunk()
|
||||
{
|
||||
free(payload);
|
||||
}
|
||||
virtual ~WireChunk()
|
||||
{
|
||||
free(payload);
|
||||
}
|
||||
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
readVal(stream, timestamp.sec);
|
||||
readVal(stream, timestamp.usec);
|
||||
readVal(stream, &payload, payloadSize);
|
||||
}
|
||||
virtual void read(std::istream& stream)
|
||||
{
|
||||
readVal(stream, timestamp.sec);
|
||||
readVal(stream, timestamp.usec);
|
||||
readVal(stream, &payload, payloadSize);
|
||||
}
|
||||
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return sizeof(tv) + sizeof(int32_t) + payloadSize;
|
||||
}
|
||||
virtual uint32_t getSize() const
|
||||
{
|
||||
return sizeof(tv) + sizeof(int32_t) + payloadSize;
|
||||
}
|
||||
|
||||
virtual chronos::time_point_clk start() const
|
||||
{
|
||||
return chronos::time_point_clk(chronos::sec(timestamp.sec) + chronos::usec(timestamp.usec));
|
||||
}
|
||||
virtual chronos::time_point_clk start() const
|
||||
{
|
||||
return chronos::time_point_clk(chronos::sec(timestamp.sec) + chronos::usec(timestamp.usec));
|
||||
}
|
||||
|
||||
tv timestamp;
|
||||
uint32_t payloadSize;
|
||||
char* payload;
|
||||
tv timestamp;
|
||||
uint32_t payloadSize;
|
||||
char* payload;
|
||||
|
||||
protected:
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, timestamp.sec);
|
||||
writeVal(stream, timestamp.usec);
|
||||
writeVal(stream, payload, payloadSize);
|
||||
}
|
||||
virtual void doserialize(std::ostream& stream) const
|
||||
{
|
||||
writeVal(stream, timestamp.sec);
|
||||
writeVal(stream, timestamp.usec);
|
||||
writeVal(stream, payload, payloadSize);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue