From 6689fc853f56faf27b63b19d971439fff83abb8d Mon Sep 17 00:00:00 2001 From: Tiny Date: Fri, 28 Dec 2018 10:18:37 +0800 Subject: [PATCH] fix(uvc osx): remove the sample with xu on osx --- samples/CMakeLists.txt | 30 ++++++++++++++------------ src/mynteye/uvc/macosx/uvc-vvuvckit.cc | 4 ---- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 2e826a0..c17feff 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -63,22 +63,24 @@ endif() set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_output") -# samples above api layer - -if(WITH_API) - add_subdirectory(api) -endif() - -# samples above device layer - -add_subdirectory(device) - +if(OS_MAC) # samples above uvc layer -#add_subdirectory(uvc) + add_subdirectory(uvc) +else() + # samples above device layer -# tutorials + add_subdirectory(device) -if(WITH_API) - add_subdirectory(tutorials) + # tutorials + + if(WITH_API) + add_subdirectory(tutorials) + endif() + + # samples above api layer + + if(WITH_API) + add_subdirectory(api) + endif() endif() diff --git a/src/mynteye/uvc/macosx/uvc-vvuvckit.cc b/src/mynteye/uvc/macosx/uvc-vvuvckit.cc index 5e16327..8032742 100644 --- a/src/mynteye/uvc/macosx/uvc-vvuvckit.cc +++ b/src/mynteye/uvc/macosx/uvc-vvuvckit.cc @@ -284,10 +284,6 @@ MYNTEYE_API std::vector> query_devices( auto camerasConfig = findDevicesConfig(); printConfig(camerasConfig); for (unsigned int i = 0; i < camerasConfig.size(); i++) { - // if (strcmp(fstr[camerasConfig[i].cam_format], "yuyv") == 0) { - // printf("change fomat to buf_format 2\n"); - // camerasConfig[i].buf_format = 2; - // } auto dev = std::make_shared(context, camerasConfig[i]); devices.push_back(dev); }