sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

A2B: Resolve warnings

add-device-sharing
Kyle Schwarz 2022-10-20 19:38:34 -04:00
parent 7b2544864b
commit 0fc676e576
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/icsneo/communication/message/callback/messagecallback.h
View File

@ -28,6 +28,8 @@ public:
: MessageCallback(cb, f) {} : MessageCallback(cb, f) {}
MessageCallback(MessageFilter f, fn_messageCallback cb) MessageCallback(MessageFilter f, fn_messageCallback cb)
: MessageCallback(cb, std::make_shared<MessageFilter>(f)) {} : MessageCallback(cb, std::make_shared<MessageFilter>(f)) {}
virtual ~MessageCallback() = default;
virtual bool callIfMatch(const std::shared_ptr<Message>& message) const { virtual bool callIfMatch(const std::shared_ptr<Message>& message) const {
bool ret = filter->match(message); bool ret = filter->match(message);

6
include/icsneo/communication/message/callback/streamoutput/a2bwavoutput.h
View File

@ -13,10 +13,10 @@ namespace icsneo {
class A2BWAVOutput : public StreamOutput { class A2BWAVOutput : public StreamOutput {
public: public:
A2BWAVOutput(const char* filename, uint32_t sampleRate = A2BPCM_SAMPLERATE_44100) A2BWAVOutput(const char* filename, uint32_t sampleRate = A2BPCM_SAMPLERATE_44100)
: wavSampleRate(sampleRate), StreamOutput(filename) {} : StreamOutput(filename), wavSampleRate(sampleRate) {}
A2BWAVOutput(std::unique_ptr<std::ostream>&& os, uint32_t sampleRate = A2BPCM_SAMPLERATE_44100) A2BWAVOutput(std::unique_ptr<std::ostream>&& os, uint32_t sampleRate = A2BPCM_SAMPLERATE_44100)
: wavSampleRate(sampleRate), StreamOutput(std::move(os)) {} : StreamOutput(std::move(os)), wavSampleRate(sampleRate) {}
void writeHeader(const std::shared_ptr<A2BMessage>& firstMsg) const; void writeHeader(const std::shared_ptr<A2BMessage>& firstMsg) const;
@ -24,7 +24,7 @@ public:
void close() const; void close() const;
~A2BWAVOutput() { ~A2BWAVOutput() override {
if(!closed) { if(!closed) {
close(); close();
} }

6
include/icsneo/communication/message/callback/streamoutput/streamoutput.h
View File

@ -82,7 +82,7 @@ struct WaveFileHeader {
class StreamOutput : public MessageCallback { class StreamOutput : public MessageCallback {
public: public:
StreamOutput(std::unique_ptr<std::ostream>&& os, fn_messageCallback cb, std::shared_ptr<MessageFilter> f) StreamOutput(std::unique_ptr<std::ostream>&& os, fn_messageCallback cb, std::shared_ptr<MessageFilter> f)
: stream(std::move(os)), MessageCallback(cb, f) {} : MessageCallback(cb, f), stream(std::move(os)) {}
StreamOutput(const char* filename, fn_messageCallback cb, std::shared_ptr<MessageFilter> f) StreamOutput(const char* filename, fn_messageCallback cb, std::shared_ptr<MessageFilter> f)
: MessageCallback(cb, f) { : MessageCallback(cb, f) {
@ -93,9 +93,7 @@ public:
stream = std::make_unique<std::ofstream>(filename, std::ios::binary); stream = std::make_unique<std::ofstream>(filename, std::ios::binary);
} }
StreamOutput(std::unique_ptr<std::ostream>&& os) : stream(std::move(os)), MessageCallback([](std::shared_ptr<Message> msg) {}) {} StreamOutput(std::unique_ptr<std::ostream>&& os) : MessageCallback([](std::shared_ptr<Message> msg) {}), stream(std::move(os)) {}
virtual ~StreamOutput() {}
protected: protected:
std::unique_ptr<std::ostream> stream; std::unique_ptr<std::ostream> stream;