3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-29 17:06:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename PcmListener to PcmStream::Listener

Browse source 
Reorganize include order
This commit is contained in:
badaix 2021-12-12 12:19:46 +01:00
parent c49841cf6f
commit d326252268
30 changed files with 227 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/streamreader/meta_stream.hpp
View file

@ -19,8 +19,11 @@
#ifndef META_STREAM_HPP
#define META_STREAM_HPP
// local headers
#include "posix_stream.hpp"
#include "resampler.hpp"
// standard headers
#include <memory>
namespace streamreader
@ -31,13 +34,13 @@ namespace streamreader
/**
* Reads PCM and passes the data to an encoder.
* Implements EncoderListener to get the encoded data.
* Data is passed to the PcmListener
* Data is passed to the PcmStream::Listener
*/
class MetaStream : public PcmStream, public PcmListener
class MetaStream : public PcmStream, public PcmStream::Listener
{
public:
/// ctor. Encoded PCM data is passed to the PcmListener
MetaStream(PcmListener* pcmListener, const std::vector<std::shared_ptr<PcmStream>>& streams, boost::asio::io_context& ioc,
/// ctor. Encoded PCM data is passed to the PcmStream::Listener
MetaStream(PcmStream::Listener* pcmListener, const std::vector<std::shared_ptr<PcmStream>>& streams, boost::asio::io_context& ioc,
const ServerSettings& server_settings, const StreamUri& uri);
virtual ~MetaStream();
@ -61,7 +64,7 @@ public:
void play(ResultHandler handler) override;
protected:
/// Implementation of PcmListener
/// Implementation of PcmStream::Listener
void onPropertiesChanged(const PcmStream* pcmStream, const Properties& properties) override;
void onStateChanged(const PcmStream* pcmStream, ReaderState state) override;
void onChunkRead(const PcmStream* pcmStream, const msg::PcmChunk& chunk) override;