diff options
Diffstat (limited to 'src/input/Zmq.h')
| -rw-r--r-- | src/input/Zmq.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/input/Zmq.h b/src/input/Zmq.h index eb67fe5..2e37b5f 100644 --- a/src/input/Zmq.h +++ b/src/input/Zmq.h @@ -2,7 +2,7 @@ Copyright (C) 2009 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2017 Matthias P. Braendli + Copyright (C) 2019 Matthias P. Braendli http://www.opendigitalradio.org ZeroMQ input. see www.zeromq.org for more info @@ -45,7 +45,7 @@ #include <list> #include <string> -#include <stdint.h> +#include <cstdint> #include "zmq.hpp" #include "input/inputs.h" #include "ManagementServer.h" @@ -156,6 +156,7 @@ class ZmqBase : public InputBase, public RemoteControllable { m_bitrate(0), m_enable_input(true), m_config(config), + m_name(name), m_stats(name), m_prebuf_current(config.prebuffering) { RC_ADD_PARAMETER(enable, @@ -180,10 +181,11 @@ class ZmqBase : public InputBase, public RemoteControllable { INVALIDATE_KEY(m_curve_encoder_key); } - virtual int open(const std::string& inputUri); - virtual int readFrame(uint8_t* buffer, size_t size); + virtual void open(const std::string& inputUri); + virtual size_t readFrame(uint8_t *buffer, size_t size); + virtual size_t readFrame(uint8_t *buffer, size_t size, std::time_t seconds, int utco, uint32_t tsta); virtual int setBitrate(int bitrate); - virtual int close(); + virtual void close(); /* Remote control */ virtual void set_parameter(const std::string& parameter, @@ -220,6 +222,7 @@ class ZmqBase : public InputBase, public RemoteControllable { char m_curve_encoder_key[CURVE_KEYLEN+1]; std::string m_inputUri; + std::string m_name; InputStat m_stats; |