Rearrage include and src

CMakeLists.txt

@@ -90,11 +90,6 @@ set_outdir(
   "${OUT_DIR}/bin"
 )
 
-set(MYNTEYE_CMAKE_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
-set(MYNTEYE_CMAKE_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
-set(MYNTEYE_CMAKE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
-set(MYNTEYE_CMAKE_INSTALLDIR "${MYNTEYE_CMAKE_LIBDIR}/cmake/${MYNTEYE_NAME}")
-
 ## main
 
 if(WITH_GLOG)
@@ -115,77 +110,51 @@ if(NOT WITH_GLOG AND NOT OS_WIN)
   unset(__MINIGLOG_FLAGS)
 endif()
 
-set(MYNTEYE_PUBLIC_H
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/callbacks.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/global.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/logger.h
-  ${CMAKE_CURRENT_BINARY_DIR}/include/mynteye/mynteye.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/types.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/utils.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/device/context.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/device/device.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/internal/files.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/internal/strings.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/internal/times.h
-)
-if(WITH_API)
-  list(APPEND MYNTEYE_PUBLIC_H
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/api/api.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/api/plugin.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/api/processor/object.h
-  )
-endif()
-if(NOT WITH_GLOG)
-  list(APPEND MYNTEYE_PUBLIC_H
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/miniglog.h
-  )
-endif()
-
 if(OS_WIN)
-  set(UVC_SRC src/uvc/uvc-wmf.cc)
+  set(UVC_SRC src/mynteye/uvc/uvc-wmf.cc)
 elseif(OS_MAC)
-  set(UVC_SRC src/uvc/uvc-libuvc.cc)
+  set(UVC_SRC src/mynteye/uvc/uvc-libuvc.cc)
 
   find_package(libuvc REQUIRED)
   set(UVC_LIB ${libuvc_LIBRARIES})
 
   include_directories(${libuvc_INCLUDE_DIRS})
 elseif(OS_LINUX)
-  set(UVC_SRC src/uvc/uvc-v4l2.cc)
+  set(UVC_SRC src/mynteye/uvc/uvc-v4l2.cc)
 else()
   message(FATAL_ERROR "Unsupported OS.")
 endif()
 
 set(MYNTEYE_SRCS
   ${UVC_SRC}
-  src/internal/channels.cc
-  src/internal/config.cc
-  src/internal/dl.cc
-  src/internal/files.cc
-  src/internal/motions.cc
-  src/internal/streams.cc
-  src/internal/strings.cc
-  src/internal/types.cc
-  src/public/types.cc
-  src/public/utils.cc
-  src/device/context.cc
-  src/device/device.cc
-  src/device/device_s.cc
+  src/mynteye/types.cc
+  src/mynteye/util/files.cc
+  src/mynteye/util/strings.cc
+  src/mynteye/device/channels.cc
+  src/mynteye/device/config.cc
+  src/mynteye/device/context.cc
+  src/mynteye/device/device.cc
+  src/mynteye/device/device_s.cc
+  src/mynteye/device/motions.cc
+  src/mynteye/device/streams.cc
+  src/mynteye/device/types.cc
+  src/mynteye/device/utils.cc
 )
 if(WITH_API)
   list(APPEND MYNTEYE_SRCS
-    src/api/api.cc
-    src/api/synthetic.cc
-    src/api/processor/processor.cc
-    src/api/processor/rectify_processor.cc
-    src/api/processor/disparity_processor.cc
-    src/api/processor/disparity_normalized_processor.cc
-    src/api/processor/depth_processor.cc
-    src/api/processor/points_processor.cc
+    src/mynteye/api/api.cc
+    src/mynteye/api/dl.cc
+    src/mynteye/api/processor.cc
+    src/mynteye/api/synthetic.cc
+    src/mynteye/api/processor/rectify_processor.cc
+    src/mynteye/api/processor/disparity_processor.cc
+    src/mynteye/api/processor/disparity_normalized_processor.cc
+    src/mynteye/api/processor/depth_processor.cc
+    src/mynteye/api/processor/points_processor.cc
   )
 endif()
 if(NOT WITH_GLOG)
-  list(APPEND MYNTEYE_SRCS src/public/miniglog.cc)
+  list(APPEND MYNTEYE_SRCS src/mynteye/miniglog.cc)
 endif()
 
 set(MYNTEYE_LINKLIBS ${UVC_LIB})
@@ -214,27 +183,78 @@ target_include_directories(${MYNTEYE_NAME} PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
-  "$<INSTALL_INTERFACE:${MYNTEYE_CMAKE_INCLUDE_DIR}>"
+  "$<INSTALL_INTERFACE:include>"
 )
 
 set_target_properties(${MYNTEYE_NAME} PROPERTIES
   VERSION ${PROJECT_VERSION}
   SOVERSION ${PROJECT_VERSION_MAJOR}
 )
-set_target_properties(${MYNTEYE_NAME} PROPERTIES
-  PUBLIC_HEADER "${MYNTEYE_PUBLIC_H}"
-)
 
 # install
 
-#message(STATUS "MYNTEYE_CMAKE_INCLUDE_DIR: ${MYNTEYE_CMAKE_INCLUDE_DIR}")
-#message(STATUS "MYNTEYE_CMAKE_BINDIR: ${MYNTEYE_CMAKE_BINDIR}")
-#message(STATUS "MYNTEYE_CMAKE_LIBDIR: ${MYNTEYE_CMAKE_LIBDIR}")
-#message(STATUS "MYNTEYE_CMAKE_INSTALLDIR: ${MYNTEYE_CMAKE_INSTALLDIR}")
+set(MYNTEYE_CMAKE_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/${MYNTEYE_NAME}")
+set(MYNTEYE_CMAKE_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
+set(MYNTEYE_CMAKE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
+set(MYNTEYE_CMAKE_INSTALLDIR "${MYNTEYE_CMAKE_LIBDIR}/cmake/${MYNTEYE_NAME}")
+
+install(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/include/mynteye/mynteye.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/global.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/logger.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/types.h
+  DESTINATION ${MYNTEYE_CMAKE_INCLUDE_DIR}
+)
+install(FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/device/callbacks.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/device/context.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/device/device.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/device/utils.h
+  DESTINATION ${MYNTEYE_CMAKE_INCLUDE_DIR}/device
+)
+install(FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/util/files.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/util/strings.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/util/times.h
+  DESTINATION ${MYNTEYE_CMAKE_INCLUDE_DIR}/util
+)
+if(WITH_API)
+  install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/api/api.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/api/plugin.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/api/object.h
+    DESTINATION ${MYNTEYE_CMAKE_INCLUDE_DIR}/api
+  )
+endif()
+if(NOT WITH_GLOG)
+  install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/miniglog.h
+    DESTINATION ${MYNTEYE_CMAKE_INCLUDE_DIR}
+  )
+endif()
+
+install(FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/callbacks.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/context.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/device.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/files.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/glog_init.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/strings.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/times.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/utils.h
+  DESTINATION ${MYNTEYE_CMAKE_INCLUDE_DIR}
+)
+if(WITH_API)
+  install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/api.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/plugin.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/deprecated/mynteye/object.h
+    DESTINATION ${MYNTEYE_CMAKE_INCLUDE_DIR}
+  )
+endif()
 
 install(TARGETS ${MYNTEYE_NAME}
   EXPORT ${MYNTEYE_NAME}-targets
-  PUBLIC_HEADER DESTINATION ${MYNTEYE_CMAKE_INCLUDE_DIR}/${MYNTEYE_NAME}
   RUNTIME DESTINATION ${MYNTEYE_CMAKE_BINDIR}
   LIBRARY DESTINATION ${MYNTEYE_CMAKE_LIBDIR}
   ARCHIVE DESTINATION ${MYNTEYE_CMAKE_LIBDIR}

include/deprecated/mynteye/api.h

@@ -0,0 +1 @@
+#include "mynteye/api/api.h"

include/deprecated/mynteye/callbacks.h

@@ -0,0 +1 @@
+#include "mynteye/device/callbacks.h"

include/deprecated/mynteye/context.h

@@ -0,0 +1 @@
+#include "mynteye/device/context.h"

include/deprecated/mynteye/device.h

@@ -0,0 +1 @@
+#include "mynteye/device/device.h"

include/deprecated/mynteye/files.h

@@ -0,0 +1 @@
+#include "mynteye/util/files.h"

include/deprecated/mynteye/glog_init.h

@@ -0,0 +1 @@
+#include "mynteye/logger.h"

include/deprecated/mynteye/object.h

@@ -0,0 +1 @@
+#include "mynteye/api/object.h"

include/deprecated/mynteye/plugin.h

@@ -0,0 +1 @@
+#include "mynteye/api/plugin.h"

include/deprecated/mynteye/strings.h

@@ -0,0 +1 @@
+#include "mynteye/util/strings.h"

include/deprecated/mynteye/times.h

@@ -0,0 +1 @@
+#include "mynteye/util/times.h"

include/deprecated/mynteye/utils.h

@@ -0,0 +1 @@
+#include "mynteye/device/utils.h"

include/mynteye/api/api.h

@@ -11,17 +11,17 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_API_H_  // NOLINT
-#define MYNTEYE_API_H_
+#ifndef MYNTEYE_API_API_H_
+#define MYNTEYE_API_API_H_
 #pragma once
 
-#include <opencv2/core/core.hpp>
-
 #include <limits>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include <opencv2/core/core.hpp>
+
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"
 
@@ -282,4 +282,4 @@ class MYNTEYE_API API {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_API_H_ NOLINT
+#endif  // MYNTEYE_API_API_H_

include/mynteye/api/object.h

@@ -11,14 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_OBJECT_H_  // NOLINT
-#define MYNTEYE_OBJECT_H_
+#ifndef MYNTEYE_API_OBJECT_H_
+#define MYNTEYE_API_OBJECT_H_
 #pragma once
 
-#include <opencv2/core/core.hpp>
-
 #include <memory>
 
+#include <opencv2/core/core.hpp>
+
 #include "mynteye/mynteye.h"
 
 MYNTEYE_BEGIN_NAMESPACE
@@ -112,4 +112,4 @@ struct MYNTEYE_API ObjMat2 : public Object {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_OBJECT_H_  NOLINT
+#endif  // MYNTEYE_API_OBJECT_H_

include/mynteye/api/plugin.h

@@ -11,14 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_PLUGIN_H_  // NOLINT
-#define MYNTEYE_PLUGIN_H_
+#ifndef MYNTEYE_API_PLUGIN_H_
+#define MYNTEYE_API_PLUGIN_H_
 #pragma once
 
-#include <opencv2/core/core.hpp>
-
 #include <cstdint>
 
+#include <opencv2/core/core.hpp>
+
 #include "mynteye/mynteye.h"
 
 #ifndef MYNTEYE_PLUGIN_VERSION_CODE
@@ -135,6 +135,7 @@ MYNTEYE_API mynteye::Plugin *plugin_create();
  * Destroy the plugin.
  */
 MYNTEYE_API void plugin_destroy(mynteye::Plugin *plugin);
+
 }
 
-#endif  // MYNTEYE_PLUGIN_H_ NOLINT
+#endif  // MYNTEYE_API_PLUGIN_H_

include/mynteye/device/callbacks.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_CALLBACKS_H_  // NOLINT
-#define MYNTEYE_CALLBACKS_H_
+#ifndef MYNTEYE_DEVICE_CALLBACKS_H_
+#define MYNTEYE_DEVICE_CALLBACKS_H_
 #pragma once
 
 #include <cstdint>
@@ -133,4 +133,4 @@ using MotionCallback = std::function<void(const MotionData &data)>;
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_CALLBACKS_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_CALLBACKS_H_

include/mynteye/device/context.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_CONTEXT_H_  // NOLINT
-#define MYNTEYE_CONTEXT_H_
+#ifndef MYNTEYE_DEVICE_CONTEXT_H_
+#define MYNTEYE_DEVICE_CONTEXT_H_
 #pragma once
 
 #include <memory>
@@ -53,4 +53,4 @@ class MYNTEYE_API Context {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_CONTEXT_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_CONTEXT_H_

include/mynteye/device/device.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_DEVICE_H_  // NOLINT
-#define MYNTEYE_DEVICE_H_
+#ifndef MYNTEYE_DEVICE_DEVICE_H_
+#define MYNTEYE_DEVICE_DEVICE_H_
 #pragma once
 
 #include <limits>
@@ -22,9 +22,9 @@
 #include <string>
 #include <vector>
 
-#include "mynteye/callbacks.h"
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"
+#include "mynteye/device/callbacks.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -322,4 +322,4 @@ class MYNTEYE_API Device {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_DEVICE_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_DEVICE_H_

include/mynteye/device/utils.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_UTILS_H_  // NOLINT
-#define MYNTEYE_UTILS_H_
+#ifndef MYNTEYE_DEVICE_UTILS_H_
+#define MYNTEYE_DEVICE_UTILS_H_
 #pragma once
 
 #include <memory>
@@ -59,4 +59,4 @@ MYNTEYE_API float get_real_exposure_time(
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_UTILS_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_UTILS_H_

include/mynteye/mynteye.h.in

@@ -45,7 +45,7 @@ MYNTEYE_API_VERSION_CHECK( \
   ((major<<16)|(minor<<8)|(patch))  // NOLINT
 
 /* MYNTEYE_API_VERSION in "X.Y.Z" format */
-#define MYNTEYE_API_VERSION_STR (STRINGIFY(MYNTEYE_API_VERSION_MAJOR.MYNTEYE_API_VERSION_MINOR.MYNTEYE_API_VERSION_PATCH))  // NOLINT
+#define MYNTEYE_API_VERSION_STR (MYNTEYE_STRINGIFY(MYNTEYE_API_VERSION_MAJOR.MYNTEYE_API_VERSION_MINOR.MYNTEYE_API_VERSION_PATCH))  // NOLINT
 
 #cmakedefine MYNTEYE_NAMESPACE @MYNTEYE_NAMESPACE@
 #if defined(MYNTEYE_NAMESPACE)

include/mynteye/types.h

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_TYPES_H_  // NOLINT
+#ifndef MYNTEYE_TYPES_H_
 #define MYNTEYE_TYPES_H_
 #pragma once
 
@@ -483,4 +483,4 @@ std::ostream &operator<<(std::ostream &os, const OptionInfo &info);
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_TYPES_H_ NOLINT
+#endif  // MYNTEYE_TYPES_H_

include/mynteye/util/files.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_FILES_H_  // NOLINT
-#define MYNTEYE_INTERNAL_FILES_H_
+#ifndef MYNTEYE_UTIL_FILES_H_
+#define MYNTEYE_UTIL_FILES_H_
 #pragma once
 
 #include <string>
@@ -29,4 +29,4 @@ MYNTEYE_API bool mkdir(const std::string &path);
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_FILES_H_ NOLINT
+#endif  // MYNTEYE_UTIL_FILES_H_

include/mynteye/util/strings.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_STRINGS_H_  // NOLINT
-#define MYNTEYE_INTERNAL_STRINGS_H_
+#ifndef MYNTEYE_UTIL_STRINGS_H_
+#define MYNTEYE_UTIL_STRINGS_H_
 #pragma once
 
 #include <stdexcept>
@@ -59,4 +59,4 @@ std::string trim_copy(const std::string &text);
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_STRINGS_H_ NOLINT
+#endif  // MYNTEYE_UTIL_STRINGS_H_

include/mynteye/util/times.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_TIMES_H_  // NOLINT
-#define MYNTEYE_INTERNAL_TIMES_H_
+#ifndef MYNTEYE_UTIL_TIMES_H_
+#define MYNTEYE_UTIL_TIMES_H_
 #pragma once
 
 #include <chrono>
@@ -220,4 +220,4 @@ inline std::string to_utc_string(
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_TIMES_H_ NOLINT
+#endif  // MYNTEYE_UTIL_TIMES_H_

samples/uvc/camera.cc

@@ -23,7 +23,7 @@
 #include "mynteye/logger.h"
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"
-#include "uvc/uvc.h"
+#include "mynteye/uvc/uvc.h"
 
 struct frame {
   const void *data = nullptr;

src/mynteye/api/api.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "api/api.h"
+#include "mynteye/api/api.h"
 
 #ifdef WITH_BOOST_FILESYSTEM
 #include <boost/filesystem.hpp>
@@ -22,13 +22,12 @@
 #include <thread>
 
 #include "mynteye/logger.h"
-#include "mynteye/utils.h"
-
-#include "api/plugin.h"
-#include "api/synthetic.h"
-#include "device/device.h"
-#include "device/device_s.h"
-#include "internal/dl.h"
+#include "mynteye/api/dl.h"
+#include "mynteye/api/plugin.h"
+#include "mynteye/api/synthetic.h"
+#include "mynteye/device/device.h"
+#include "mynteye/device/device_s.h"
+#include "mynteye/device/utils.h"
 
 #if defined(WITH_FILESYSTEM) && defined(WITH_NATIVE_FILESYSTEM)
 #if defined(MYNTEYE_OS_WIN)

src/mynteye/api/dl.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "internal/dl.h"
+#include "mynteye/api/dl.h"
 
 #include "mynteye/logger.h"
 

src/mynteye/api/dl.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_DL_H_  // NOLINT
-#define MYNTEYE_INTERNAL_DL_H_
+#ifndef MYNTEYE_API_DL_H_
+#define MYNTEYE_API_DL_H_
 #pragma once
 
 #include "mynteye/mynteye.h"
@@ -68,4 +68,4 @@ Func *DL::Sym(const char *symbol) {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_DL_H_  NOLINT
+#endif  // MYNTEYE_API_DL_H_

src/mynteye/api/processor.cc

@@ -11,15 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "api/processor/processor.h"
+#include "mynteye/api/processor.h"
 
 #include <exception>
 #include <utility>
 
 #include "mynteye/logger.h"
-
-#include "internal/strings.h"
-#include "internal/times.h"
+#include "mynteye/util/strings.h"
+#include "mynteye/util/times.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/api/processor.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_PROCESSOR_H_  // NOLINT
-#define MYNTEYE_PROCESSOR_H_
+#ifndef MYNTEYE_API_PROCESSOR_H_
+#define MYNTEYE_API_PROCESSOR_H_
 #pragma once
 
 #include <condition_variable>
@@ -25,8 +25,7 @@
 #include <thread>
 
 #include "mynteye/mynteye.h"
-
-#include "api/processor/object.h"
+#include "mynteye/api/object.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -119,4 +118,4 @@ void iterate_processors(
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_PROCESSOR_H_  NOLINT
+#endif  // MYNTEYE_API_PROCESSOR_H_

src/mynteye/api/processor/depth_processor.cc

@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "api/processor/depth_processor.h"
-
-#include "mynteye/logger.h"
+#include "mynteye/api/processor/depth_processor.h"
 
 #include <utility>
 
+#include "mynteye/logger.h"
+
 MYNTEYE_BEGIN_NAMESPACE
 
 const char DepthProcessor::NAME[] = "DepthProcessor";

src/mynteye/api/processor/depth_processor.h

@@ -11,13 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_DEPTH_PROCESSOR_H_  // NOLINT
-#define MYNTEYE_DEPTH_PROCESSOR_H_
+#ifndef MYNTEYE_API_PROCESSOR_DEPTH_PROCESSOR_H_
+#define MYNTEYE_API_PROCESSOR_DEPTH_PROCESSOR_H_
 #pragma once
 
 #include <string>
 
-#include "api/processor/processor.h"
+#include "mynteye/api/processor.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -38,4 +38,4 @@ class DepthProcessor : public Processor {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_DEPTH_PROCESSOR_H_  NOLINT
+#endif  // MYNTEYE_API_PROCESSOR_DEPTH_PROCESSOR_H_

src/mynteye/api/processor/disparity_normalized_processor.cc

@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "api/processor/disparity_normalized_processor.h"
-
-#include <opencv2/imgproc/imgproc.hpp>
+#include "mynteye/api/processor/disparity_normalized_processor.h"
 
 #include <utility>
 
+#include <opencv2/imgproc/imgproc.hpp>
+
 #include "mynteye/logger.h"
 
 MYNTEYE_BEGIN_NAMESPACE

src/mynteye/api/processor/disparity_normalized_processor.h

@@ -11,13 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_DISPARITY_NORMALIZED_PROCESSOR_H_  // NOLINT
-#define MYNTEYE_DISPARITY_NORMALIZED_PROCESSOR_H_
+#ifndef MYNTEYE_API_PROCESSOR_DISPARITY_NORMALIZED_PROCESSOR_H_
+#define MYNTEYE_API_PROCESSOR_DISPARITY_NORMALIZED_PROCESSOR_H_
 #pragma once
 
 #include <string>
 
-#include "api/processor/processor.h"
+#include "mynteye/api/processor.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -38,4 +38,4 @@ class DisparityNormalizedProcessor : public Processor {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_DISPARITY_NORMALIZED_PROCESSOR_H_  NOLINT
+#endif  // MYNTEYE_API_PROCESSOR_DISPARITY_NORMALIZED_PROCESSOR_H_

src/mynteye/api/processor/disparity_processor.cc

@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "api/processor/disparity_processor.h"
-
-#include <opencv2/calib3d/calib3d.hpp>
+#include "mynteye/api/processor/disparity_processor.h"
 
 #include <utility>
 
+#include <opencv2/calib3d/calib3d.hpp>
+
 #include "mynteye/logger.h"
 
 MYNTEYE_BEGIN_NAMESPACE

src/mynteye/api/processor/disparity_processor.h

@@ -11,13 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_DISPARITY_PROCESSOR_H_  // NOLINT
-#define MYNTEYE_DISPARITY_PROCESSOR_H_
+#ifndef MYNTEYE_API_PROCESSOR_DISPARITY_PROCESSOR_H_
+#define MYNTEYE_API_PROCESSOR_DISPARITY_PROCESSOR_H_
 #pragma once
 
 #include <string>
 
-#include "api/processor/processor.h"
+#include "mynteye/api/processor.h"
 
 namespace cv {
 
@@ -47,4 +47,4 @@ class DisparityProcessor : public Processor {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_DISPARITY_PROCESSOR_H_  NOLINT
+#endif  // MYNTEYE_API_PROCESSOR_DISPARITY_PROCESSOR_H_

src/mynteye/api/processor/points_processor.cc

@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "api/processor/points_processor.h"
-
-#include <opencv2/calib3d/calib3d.hpp>
+#include "mynteye/api/processor/points_processor.h"
 
 #include <utility>
 
+#include <opencv2/calib3d/calib3d.hpp>
+
 #include "mynteye/logger.h"
 
 MYNTEYE_BEGIN_NAMESPACE

src/mynteye/api/processor/points_processor.h

@@ -11,15 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_POINTS_PROCESSOR_H_  // NOLINT
-#define MYNTEYE_POINTS_PROCESSOR_H_
+#ifndef MYNTEYE_API_PROCESSOR_POINTS_PROCESSOR_H_
+#define MYNTEYE_API_PROCESSOR_POINTS_PROCESSOR_H_
 #pragma once
 
-#include <opencv2/core/core.hpp>
-
 #include <string>
 
-#include "api/processor/processor.h"
+#include <opencv2/core/core.hpp>
+
+#include "mynteye/api/processor.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -43,4 +43,4 @@ class PointsProcessor : public Processor {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_POINTS_PROCESSOR_H_  NOLINT
+#endif  // MYNTEYE_API_PROCESSOR_POINTS_PROCESSOR_H_

src/mynteye/api/processor/rectify_processor.cc

@@ -11,16 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "api/processor/rectify_processor.h"
+#include "mynteye/api/processor/rectify_processor.h"
+
+#include <utility>
 
 #include <opencv2/calib3d/calib3d.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include <utility>
-
 #include "mynteye/logger.h"
-
-#include "device/device.h"
+#include "mynteye/device/device.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/api/processor/rectify_processor.h

@@ -11,17 +11,17 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_RECTIFY_PROCESSOR_H_  // NOLINT
-#define MYNTEYE_RECTIFY_PROCESSOR_H_
+#ifndef MYNTEYE_API_PROCESSOR_RECTIFY_PROCESSOR_H_
+#define MYNTEYE_API_PROCESSOR_RECTIFY_PROCESSOR_H_
 #pragma once
 
-#include <opencv2/core/core.hpp>
-
 #include <memory>
 #include <string>
 
-#include "api/processor/processor.h"
+#include <opencv2/core/core.hpp>
+
 #include "mynteye/types.h"
+#include "mynteye/api/processor.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -52,4 +52,4 @@ class RectifyProcessor : public Processor {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_RECTIFY_PROCESSOR_H_  NOLINT
+#endif  // MYNTEYE_API_PROCESSOR_RECTIFY_PROCESSOR_H_

src/mynteye/api/synthetic.cc

@@ -11,23 +11,22 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "api/synthetic.h"
+#include "mynteye/api/synthetic.h"
 
 #include <algorithm>
 #include <functional>
 #include <stdexcept>
 
 #include "mynteye/logger.h"
-
-#include "api/plugin.h"
-#include "api/processor/depth_processor.h"
-#include "api/processor/disparity_normalized_processor.h"
-#include "api/processor/disparity_processor.h"
-#include "api/processor/object.h"
-#include "api/processor/points_processor.h"
-#include "api/processor/processor.h"
-#include "api/processor/rectify_processor.h"
-#include "device/device.h"
+#include "mynteye/api/object.h"
+#include "mynteye/api/plugin.h"
+#include "mynteye/api/processor.h"
+#include "mynteye/api/processor/depth_processor.h"
+#include "mynteye/api/processor/disparity_normalized_processor.h"
+#include "mynteye/api/processor/disparity_processor.h"
+#include "mynteye/api/processor/points_processor.h"
+#include "mynteye/api/processor/rectify_processor.h"
+#include "mynteye/device/device.h"
 
 #define RECTIFY_PROC_PERIOD 0
 #define DISPARITY_PROC_PERIOD 0

src/mynteye/api/synthetic.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_SYNTHETIC_H_  // NOLINT
-#define MYNTEYE_SYNTHETIC_H_
+#ifndef MYNTEYE_API_SYNTHETIC_H_
+#define MYNTEYE_API_SYNTHETIC_H_
 #pragma once
 
 #include <map>
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "api/api.h"
+#include "mynteye/api/api.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -169,4 +169,4 @@ bool Synthetic::DeactivateProcessor(bool childs) {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_SYNTHETIC_H_ NOLINT
+#endif  // MYNTEYE_API_SYNTHETIC_H_

src/mynteye/device/async_callback.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_ASYNC_CALLBACK_H_  // NOLINT
-#define MYNTEYE_INTERNAL_ASYNC_CALLBACK_H_
+#ifndef MYNTEYE_DEVICE_ASYNC_CALLBACK_H_
+#define MYNTEYE_DEVICE_ASYNC_CALLBACK_H_
 #pragma once
 
 #include <condition_variable>
@@ -57,6 +57,6 @@ class AsyncCallback {
 
 MYNTEYE_END_NAMESPACE
 
-#include "internal/async_callback_impl.h"
+#include "mynteye/device/async_callback_impl.h"
 
-#endif  // MYNTEYE_INTERNAL_ASYNC_CALLBACK_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_ASYNC_CALLBACK_H_

src/mynteye/device/async_callback_impl.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_ASYNC_CALLBACK_IMPL_H_  // NOLINT
-#define MYNTEYE_INTERNAL_ASYNC_CALLBACK_IMPL_H_
+#ifndef MYNTEYE_DEVICE_ASYNC_CALLBACK_IMPL_H_
+#define MYNTEYE_DEVICE_ASYNC_CALLBACK_IMPL_H_
 #pragma once
 
 #include <string>
@@ -89,4 +89,4 @@ void AsyncCallback<Data>::Run() {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_ASYNC_CALLBACK_IMPL_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_ASYNC_CALLBACK_IMPL_H_

src/mynteye/device/channels.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "internal/channels.h"
+#include "mynteye/device/channels.h"
 
 #include <bitset>
 #include <chrono>
@@ -21,9 +21,8 @@
 #include <stdexcept>
 
 #include "mynteye/logger.h"
-
-#include "internal/strings.h"
-#include "internal/times.h"
+#include "mynteye/util/strings.h"
+#include "mynteye/util/times.h"
 
 #define IMU_TRACK_PERIOD 25  // ms
 

src/mynteye/device/channels.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_CHANNELS_H_  // NOLINT
-#define MYNTEYE_INTERNAL_CHANNELS_H_
+#ifndef MYNTEYE_DEVICE_CHANNELS_H_
+#define MYNTEYE_DEVICE_CHANNELS_H_
 #pragma once
 
 #include <map>
@@ -21,9 +21,8 @@
 
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"
-
-#include "internal/types.h"
-#include "uvc/uvc.h"
+#include "mynteye/device/types.h"
+#include "mynteye/uvc/uvc.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -154,4 +153,4 @@ class MYNTEYE_API Channels {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_CHANNELS_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_CHANNELS_H_

src/mynteye/device/config.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "internal/config.h"
+#include "mynteye/device/config.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/device/config.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_CONFIG_H_  // NOLINT
-#define MYNTEYE_INTERNAL_CONFIG_H_
+#ifndef MYNTEYE_DEVICE_CONFIG_H_
+#define MYNTEYE_DEVICE_CONFIG_H_
 #pragma once
 
 #include <map>
@@ -39,4 +39,4 @@ extern const std::map<Model, std::map<Capabilities, StreamRequests>>
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_CONFIG_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_CONFIG_H_

src/mynteye/device/context.cc

@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "device/context.h"
+#include "mynteye/device/context.h"
 
 #include "mynteye/logger.h"
 
-#include "device/device.h"
-#include "uvc/uvc.h"
+#include "mynteye/device/device.h"
+#include "mynteye/uvc/uvc.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/device/device.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "device/device.h"
+#include "mynteye/device/device.h"
 
 #include <algorithm>
 #include <iterator>
@@ -19,17 +19,16 @@
 #include <utility>
 
 #include "mynteye/logger.h"
-
-#include "device/device_s.h"
-#include "internal/async_callback.h"
-#include "internal/channels.h"
-#include "internal/config.h"
-#include "internal/motions.h"
-#include "internal/streams.h"
-#include "internal/strings.h"
-#include "internal/times.h"
-#include "internal/types.h"
-#include "uvc/uvc.h"
+#include "mynteye/device/async_callback.h"
+#include "mynteye/device/channels.h"
+#include "mynteye/device/config.h"
+#include "mynteye/device/device_s.h"
+#include "mynteye/device/motions.h"
+#include "mynteye/device/streams.h"
+#include "mynteye/device/types.h"
+#include "mynteye/util/strings.h"
+#include "mynteye/util/times.h"
+#include "mynteye/uvc/uvc.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/device/device_s.cc

@@ -11,11 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "device/device_s.h"
+#include "mynteye/device/device_s.h"
 
 #include "mynteye/logger.h"
-
-#include "internal/motions.h"
+#include "mynteye/device/motions.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/device/device_s.h

@@ -11,14 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_DEVICE_S_H_  // NOLINT
-#define MYNTEYE_DEVICE_S_H_
+#ifndef MYNTEYE_DEVICE_DEVICE_S_H_
+#define MYNTEYE_DEVICE_DEVICE_S_H_
 #pragma once
 
 #include <memory>
 #include <vector>
 
-#include "device/device.h"
+#include "mynteye/device/device.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -34,4 +34,4 @@ class StandardDevice : public Device {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_DEVICE_S_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_DEVICE_S_H_

src/mynteye/device/motions.cc

@@ -11,11 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "internal/motions.h"
+#include "mynteye/device/motions.h"
 
 #include "mynteye/logger.h"
-
-#include "internal/channels.h"
+#include "mynteye/device/channels.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/device/motions.h

@@ -11,16 +11,16 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_MOTIONS_H_  // NOLINT
-#define MYNTEYE_INTERNAL_MOTIONS_H_
+#ifndef MYNTEYE_DEVICE_MOTIONS_H_
+#define MYNTEYE_DEVICE_MOTIONS_H_
 #pragma once
 
 #include <memory>
 #include <mutex>
 #include <vector>
 
-#include "mynteye/callbacks.h"
 #include "mynteye/mynteye.h"
+#include "mynteye/device/callbacks.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -61,4 +61,4 @@ class Motions {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_MOTIONS_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_MOTIONS_H_

src/mynteye/device/streams.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "internal/streams.h"
+#include "mynteye/device/streams.h"
 
 #include <algorithm>
 #include <chrono>
@@ -19,8 +19,7 @@
 #include <stdexcept>
 
 #include "mynteye/logger.h"
-
-#include "internal/types.h"
+#include "mynteye/device/types.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/device/streams.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_STREAMS_H_  // NOLINT
-#define MYNTEYE_INTERNAL_STREAMS_H_
+#ifndef MYNTEYE_DEVICE_STREAMS_H_
+#define MYNTEYE_DEVICE_STREAMS_H_
 #pragma once
 
 #include <condition_variable>
@@ -21,9 +21,9 @@
 #include <mutex>
 #include <vector>
 
-#include "mynteye/callbacks.h"
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"
+#include "mynteye/device/callbacks.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 
@@ -90,4 +90,4 @@ class Streams {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_STREAMS_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_STREAMS_H_

src/mynteye/device/types.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "internal/types.h"
+#include "mynteye/device/types.h"
 
 #include <algorithm>
 #include <iomanip>

src/mynteye/device/types.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_INTERNAL_TYPES_H_  // NOLINT
-#define MYNTEYE_INTERNAL_TYPES_H_
+#ifndef MYNTEYE_DEVICE_TYPES_H_
+#define MYNTEYE_DEVICE_TYPES_H_
 #pragma once
 
 #include <cstdint>
@@ -293,4 +293,4 @@ struct ImuResPacket {
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_INTERNAL_TYPES_H_ NOLINT
+#endif  // MYNTEYE_DEVICE_TYPES_H_

src/mynteye/device/utils.cc

@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "mynteye/utils.h"
+#include "mynteye/device/utils.h"
 
 #include "mynteye/logger.h"
 
-#include "device/context.h"
-#include "device/device.h"
+#include "mynteye/device/context.h"
+#include "mynteye/device/device.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/util/files.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "internal/files.h"
+#include "mynteye/util/files.h"
 
 #include "mynteye/logger.h"
 
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #endif
 
-#include "internal/strings.h"
+#include "mynteye/util/strings.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/mynteye/util/strings.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "internal/strings.h"
+#include "mynteye/util/strings.h"
 
 #include <algorithm>
 #include <cctype>

src/mynteye/uvc/uvc-libuvc.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "uvc/uvc.h"  // NOLINT
+#include "mynteye/uvc/uvc.h"
 
 #include <libuvc/libuvc.h>
 

src/mynteye/uvc/uvc-v4l2.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "uvc/uvc.h"  // NOLINT
+#include "mynteye/uvc/uvc.h"
 
 #include <dirent.h>
 #include <errno.h>

src/mynteye/uvc/uvc-wmf.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "uvc/uvc.h"  // NOLINT
+#include "mynteye/uvc/uvc.h"
 
 #include <windows.h>
 #include <usbioctl.h>

src/mynteye/uvc/uvc.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef MYNTEYE_UVC_H_  // NOLINT
-#define MYNTEYE_UVC_H_
+#ifndef MYNTEYE_UVC_UVC_H_
+#define MYNTEYE_UVC_UVC_H_
 #pragma once
 
 #include <functional>
@@ -106,4 +106,4 @@ MYNTEYE_API void stop_streaming(device &device);                          // NOL
 
 MYNTEYE_END_NAMESPACE
 
-#endif  // MYNTEYE_UVC_H_ NOLINT
+#endif  // MYNTEYE_UVC_UVC_H_

test/device/types_test.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "gtest/gtest.h"
 
-#include "internal/types.h"
+#include "mynteye/device/types.h"
 
 MYNTEYE_USE_NAMESPACE
 

tools/writer/device_writer.h

@@ -19,9 +19,8 @@
 #include <string>
 
 #include "mynteye/mynteye.h"
-
-#include "internal/channels.h"
-#include "internal/types.h"
+#include "mynteye/device/channels.h"
+#include "mynteye/device/types.h"
 
 MYNTEYE_BEGIN_NAMESPACE