ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Bugfix: duplex stream came on output

Browse Source
This commit is contained in:
Thijs Hekman 2022-10-19 10:03:13 +02:00
parent e274e12f82
commit 6bd03301aa
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lasp/device/lasp_streammgr.cpp
View File

@ -240,7 +240,8 @@ void StreamMgr::startStream(const DaqConfiguration &config) {
devinfo = *devinfo2; devinfo = *devinfo2;
} }
isInput |= config.monitorOutput && devinfo.hasInternalOutputMonitor; isInput |= (config.monitorOutput && devinfo.hasInternalOutputMonitor);
DEBUGTRACE_PRINT(isInput);
bool isDuplex = isInput && isOutput; bool isDuplex = isInput && isOutput;
@ -284,7 +285,9 @@ void StreamMgr::startStream(const DaqConfiguration &config) {
_siggen->reset(daq->samplerate()); _siggen->reset(daq->samplerate());
} }
outCallback = std::bind(&StreamMgr::outCallback, this, _1); outCallback = std::bind(&StreamMgr::outCallback, this, _1);
if(!isDuplex) {
stream_placeholder = std::addressof(_outputStream); stream_placeholder = std::addressof(_outputStream);
}
} }
daq->start(inCallback, outCallback); daq->start(inCallback, outCallback);
@ -369,10 +372,11 @@ const Daq *StreamMgr::getDaq(StreamType type) const {
return _inputStream.get(); return _inputStream.get();
} else { } else {
// Output stream. If input runs in duplex mode, this is also the output // Output stream. If input runs in duplex mode, this is also the output
// stream. In that case, we return the outputstram // stream. In that case, we return the input stream
if (_inputStream && _inputStream->duplexMode()) { if (_inputStream && _inputStream->duplexMode()) {
return _inputStream.get(); return _inputStream.get();
} else {
return _outputStream.get();
} }
return _outputStream.get();
} }
} }