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

Use callback function instead of class

Browse source
This commit is contained in:
badaix 2025-02-16 22:04:33 +01:00 • committed by Johannes Pohl
parent efd050a716
commit f0985cbce4
4 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

37
server/streamreader/process_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
@ -42,38 +42,43 @@ using boost::asio::posix::stream_descriptor;
* Implements EncoderListener to get the encoded data.
* Data is passed to the PcmStream::Listener
*/
class ProcessStream : public AsioStream<stream_descriptor>, public WatchdogListener
class ProcessStream : public AsioStream<stream_descriptor>
{
public:
/// ctor. Encoded PCM data is passed to the PipeListener
/// c'tor. Encoded PCM data is passed to the PipeListener
ProcessStream(PcmStream::Listener* pcmListener, boost::asio::io_context& ioc, const ServerSettings& server_settings, const StreamUri& uri);
/// d'tor
~ProcessStream() override = default;
protected:
void connect() override;
void disconnect() override;
std::string exe_;
std::string path_;
std::string params_;
bp::pipe pipe_stdout_;
bp::pipe pipe_stderr_;
bp::child process_;
std::string exe_; ///< filename of the process
std::string path_; ///< base path of the provess
std::string params_; ///< parameters for the process
bp::pipe pipe_stdout_; ///< stdout of the process
bp::pipe pipe_stderr_; ///< stderr of the process
bp::child process_; ///< the process
bool logStderr_;
boost::asio::streambuf streambuf_stderr_;
std::unique_ptr<stream_descriptor> stream_stderr_;
bool logStderr_; ///< log stderr to log?
boost::asio::streambuf streambuf_stderr_; ///< stderr read buffer
std::unique_ptr<stream_descriptor> stream_stderr_; ///< stderr stream
// void worker() override;
/// Read async from stderr
virtual void stderrReadLine();
/// Called for a line read from stderr
virtual void onStderrMsg(const std::string& line);
/// Try to find exe and base path, throw on error
virtual void initExeAndPath(const std::string& filename);
/// @return the executables complete path to @p filename
std::string findExe(const std::string& filename) const;
size_t wd_timeout_sec_;
std::unique_ptr<Watchdog> watchdog_;
void onTimeout(const Watchdog& watchdog, std::chrono::milliseconds ms) override;
size_t wd_timeout_sec_; ///< Watchdog timeout for arrival of new log lines
std::unique_ptr<Watchdog> watchdog_; ///< the watchdog
/// called on wd timeout, kills the process
void onTimeout(std::chrono::milliseconds ms);
};
} // namespace streamreader