Device: Use lambda instead of std::bind
parent
a0f73755e8
commit
1bb33156f7
|
|
@ -398,7 +398,11 @@ protected:
|
||||||
setupDecoder(*decoder);
|
setupDecoder(*decoder);
|
||||||
com = makeCommunication(
|
com = makeCommunication(
|
||||||
makeDriver(report, getWritableNeoDevice()),
|
makeDriver(report, getWritableNeoDevice()),
|
||||||
std::bind(&Device::makeConfiguredPacketizer, this),
|
[this]() -> std::unique_ptr<Packetizer> {
|
||||||
|
auto packetizer = makePacketizer();
|
||||||
|
setupPacketizer(*packetizer);
|
||||||
|
return packetizer;
|
||||||
|
},
|
||||||
std::move(encoder),
|
std::move(encoder),
|
||||||
std::move(decoder)
|
std::move(decoder)
|
||||||
);
|
);
|
||||||
|
|
@ -420,11 +424,6 @@ protected:
|
||||||
|
|
||||||
virtual std::unique_ptr<Packetizer> makePacketizer() { return std::unique_ptr<Packetizer>(new Packetizer(report)); }
|
virtual std::unique_ptr<Packetizer> makePacketizer() { return std::unique_ptr<Packetizer>(new Packetizer(report)); }
|
||||||
virtual void setupPacketizer(Packetizer&) {}
|
virtual void setupPacketizer(Packetizer&) {}
|
||||||
std::unique_ptr<Packetizer> makeConfiguredPacketizer() {
|
|
||||||
auto packetizer = makePacketizer();
|
|
||||||
setupPacketizer(*packetizer);
|
|
||||||
return packetizer;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual std::unique_ptr<Encoder> makeEncoder() { return std::unique_ptr<Encoder>(new Encoder(report)); }
|
virtual std::unique_ptr<Encoder> makeEncoder() { return std::unique_ptr<Encoder>(new Encoder(report)); }
|
||||||
virtual void setupEncoder(Encoder&) {}
|
virtual void setupEncoder(Encoder&) {}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue