Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop
This commit is contained in:
commit
6830d5192e
|
@ -71,7 +71,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||||
link_directories(C:\\mingw\\lib)
|
link_directories(C:\\mingw\\lib)
|
||||||
link_directories(C:\\mingw\\bin)
|
link_directories(C:\\mingw\\bin)
|
||||||
link_directories(..\\rtaudio)
|
link_directories(..\\rtaudio)
|
||||||
link_directories(C:\\Users\\librewin7\\Miniconda3)
|
link_directories(C:\\Users\\User\\Miniconda3)
|
||||||
else()
|
else()
|
||||||
set(win32 false)
|
set(win32 false)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c11 \
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c11 \
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"""
|
"""
|
||||||
Description: Read data from image stream and record sound at the same time
|
Description: Read data from image stream and record sound at the same time
|
||||||
"""
|
"""
|
||||||
import cv2 as cv
|
#import cv2 as cv
|
||||||
from .lasp_atomic import Atomic
|
from .lasp_atomic import Atomic
|
||||||
from threading import Thread, Condition, Lock
|
from threading import Thread, Condition, Lock
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
Loading…
Reference in New Issue
Block a user