Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop

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()

src/mynteye/uvc/macosx/uvc-vvuvckit.cc

@@ -284,10 +284,6 @@ MYNTEYE_API std::vector<std::shared_ptr<device>> 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<device>(context, camerasConfig[i]);
     devices.push_back(dev);
   }