3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-28 08:26:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make metadata thread safe, poll properties

Browse source
This commit is contained in:
badaix 2021-06-23 20:48:25 +02:00
parent 1f51befbad
commit 0853c7c701
10 changed files with 124 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/streamreader/pcm_stream.hpp
View file

@ -20,11 +20,13 @@
#define PCM_STREAM_HPP
#include <atomic>
#include <mutex>
#include <string>
#include <vector>
#include <boost/asio/io_context.hpp>
#include <boost/asio/read_until.hpp>
#include <boost/asio/steady_timer.hpp>
#include <boost/optional.hpp>
#include "common/json.hpp"
@ -96,8 +98,8 @@ static constexpr auto kControlScript = "controlscript";
class PcmListener
{
public:
virtual void onMetadataChanged(const PcmStream* pcmStream) = 0;
virtual void onPropertiesChanged(const PcmStream* pcmStream) = 0;
virtual void onMetadataChanged(const PcmStream* pcmStream, const Metatags& metadata) = 0;
virtual void onPropertiesChanged(const PcmStream* pcmStream, const Properties& properties) = 0;
virtual void onStateChanged(const PcmStream* pcmStream, ReaderState state) = 0;
virtual void onChunkRead(const PcmStream* pcmStream, const msg::PcmChunk& chunk) = 0;
virtual void onChunkEncoded(const PcmStream* pcmStream, std::shared_ptr<msg::PcmChunk> chunk, double duration) = 0;
@ -154,7 +156,9 @@ protected:
void chunkEncoded(const encoder::Encoder& encoder, std::shared_ptr<msg::PcmChunk> chunk, double duration);
void setMetadata(const Metatags& metadata);
void setProperties(const Properties& props);
void setProperties(const Properties& properties);
void pollProperties();
std::chrono::time_point<std::chrono::steady_clock> tvEncodedChunk_;
std::vector<PcmListener*> pcmListeners_;
@ -169,7 +173,9 @@ protected:
boost::asio::io_context& ioc_;
ServerSettings server_settings_;
std::unique_ptr<StreamControl> stream_ctrl_;
int req_id_;
std::atomic<int> req_id_;
boost::asio::steady_timer property_timer_;
mutable std::mutex mutex_;
};
} // namespace streamreader