3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-31 15:19:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make callbacks rvalues

Browse source
This commit is contained in:
badaix 2025-02-09 21:02:22 +01:00 • committed by Johannes Pohl
parent 164b3abf40
commit fa83fc155d
5 changed files with 65 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

33
server/streamreader/meta_stream.hpp
View file

@ -1,6 +1,6 @@
/***
This file is part of snapcast
Copyright (C) 2014-2024 Johannes Pohl
Copyright (C) 2014-2025 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
@ -41,30 +41,31 @@ namespace streamreader
class MetaStream : public PcmStream, public PcmStream::Listener
{
public:
/// ctor. Encoded PCM data is passed to the PcmStream::Listener
/// c'tor. 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);
/// d'tor
virtual ~MetaStream();
void start() override;
void stop() override;
// Setter for properties
void setShuffle(bool shuffle, ResultHandler handler) override;
void setLoopStatus(LoopStatus status, ResultHandler handler) override;
void setVolume(uint16_t volume, ResultHandler handler) override;
void setMute(bool mute, ResultHandler handler) override;
void setRate(float rate, ResultHandler handler) override;
void setShuffle(bool shuffle, ResultHandler&& handler) override;
void setLoopStatus(LoopStatus status, ResultHandler&& handler) override;
void setVolume(uint16_t volume, ResultHandler&& handler) override;
void setMute(bool mute, ResultHandler&& handler) override;
void setRate(float rate, ResultHandler&& handler) override;
// Control commands
void setPosition(std::chrono::milliseconds position, ResultHandler handler) override;
void seek(std::chrono::milliseconds offset, ResultHandler handler) override;
void next(ResultHandler handler) override;
void previous(ResultHandler handler) override;
void pause(ResultHandler handler) override;
void playPause(ResultHandler handler) override;
void stop(ResultHandler handler) override;
void play(ResultHandler handler) override;
void setPosition(std::chrono::milliseconds position, ResultHandler&& handler) override;
void seek(std::chrono::milliseconds offset, ResultHandler&& handler) override;
void next(ResultHandler&& handler) override;
void previous(ResultHandler&& handler) override;
void pause(ResultHandler&& handler) override;
void playPause(ResultHandler&& handler) override;
void stop(ResultHandler&& handler) override;
void play(ResultHandler&& handler) override;
protected:
/// Implementation of PcmStream::Listener
@ -74,7 +75,7 @@ protected:
void onChunkEncoded(const PcmStream* pcmStream, std::shared_ptr<msg::PcmChunk> chunk, double duration) override;
void onResync(const PcmStream* pcmStream, double ms) override;
protected:
private:
std::vector<std::shared_ptr<PcmStream>> streams_;
std::recursive_mutex active_mutex_;
std::shared_ptr<PcmStream> active_stream_;