Some comment improvement and cleanup
This commit is contained in:
parent
6a006e27f9
commit
da99618fc3
@ -1,6 +1,6 @@
|
||||
cmake_minimum_required (VERSION 3.16)
|
||||
|
||||
project(LASP LANGUAGES CXX)
|
||||
project(LASP LANGUAGES C CXX)
|
||||
|
||||
# To allow linking to static libs from other directories
|
||||
cmake_policy(SET CMP0079 NEW)
|
||||
@ -10,10 +10,6 @@ include("BuildType")
|
||||
include("QueryPythonForPybind11")
|
||||
|
||||
|
||||
# Generate stubs for the Python module
|
||||
option(WITH_PY_STUBS
|
||||
"Generate Python stub files (.pyi) for the Python module." On)
|
||||
|
||||
# Find the pybind11 package
|
||||
find_pybind11_python_first()
|
||||
|
||||
@ -50,7 +46,6 @@ find_package(BLAS REQUIRED)
|
||||
add_definitions(-DLASP_MAX_NFFT=33554432) # 2**25
|
||||
|
||||
# ####################################### End of user-adjustable variables section
|
||||
|
||||
include(OSSpecific)
|
||||
|
||||
|
||||
|
@ -122,7 +122,7 @@ class RtAudioDaq : public Daq {
|
||||
|
||||
std::atomic<StreamStatus> _streamStatus{};
|
||||
|
||||
public:
|
||||
public:
|
||||
RtAudioDaq(const DeviceInfo &devinfo, const DaqConfiguration &config)
|
||||
: Daq(devinfo, config),
|
||||
rtaudio(static_cast<RtAudio::Api>(devinfo.api.api_specific_subcode)),
|
||||
@ -236,6 +236,7 @@ public:
|
||||
"Output callback given, but stream does not provide output data");
|
||||
}
|
||||
}
|
||||
|
||||
rtaudio.startStream();
|
||||
|
||||
// If we are here, we are running without errors.
|
||||
@ -251,6 +252,10 @@ public:
|
||||
if (getStreamStatus().runningOK()) {
|
||||
rtaudio.stopStream();
|
||||
}
|
||||
StreamStatus s = _streamStatus;
|
||||
s.isRunning = false;
|
||||
s.errorType = StreamStatus::StreamError::noError;
|
||||
_streamStatus = s;
|
||||
}
|
||||
|
||||
int streamCallback(void *outputBuffer, void *inputBuffer,
|
||||
@ -268,6 +273,7 @@ public:
|
||||
StreamStatus stat = _streamStatus;
|
||||
stat.errorType = e;
|
||||
stat.isRunning = false;
|
||||
_streamStatus = stat;
|
||||
rval = 1;
|
||||
};
|
||||
|
||||
|
2
third_party/fftpack/CMakeLists.txt
vendored
2
third_party/fftpack/CMakeLists.txt
vendored
@ -6,4 +6,4 @@ add_library(fftpack
|
||||
|
||||
# Ling fft to math
|
||||
target_link_libraries(fftpack PRIVATE m)
|
||||
interface_include_directories(fftpack .)
|
||||
target_include_directories(fftpack PUBLIC .)
|
||||
|
Loading…
Reference in New Issue
Block a user