Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 0 insertions, 58 deletions

diff --git a/opentrack-api/opentrack.h b/opentrack-api/opentrack.h
deleted file mode 100644
index 88ba6cf0..00000000
--- a/opentrack-api/opentrack.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef IN_OPENTRACK
-/* opaque pointers, forward definitions */
-struct opentrack_opaque_ctx;
-typedef struct opentrack_opaque_ctx* opentrack;
-struct opentrack_opaque_tracker;
-typedef struct opentrack_opaque_tracker* opentrack_tracker;
-#endif
-
-#ifdef IN_OPENTRACK
-#   ifdef _WIN32
-#       define OPENTRACK_EXPORT __declspec(dllexport)
-#   else
-#       define OPENTRACK_EXPORT
-#   endif
-#else
-#   ifdef _WIN32
-#       define OPENTRACK_EXPORT __declspec(dllimport)
-#   else
-#       define OPENTRACK_EXPORT
-#   endif
-#endif
-
-/* for `opentrack_tracker_tick', individual headpose elts */
-#ifndef IN_OPENTRACK
-enum opentrack_dof {
-    TX = 0,
-    TY,
-    TZ,
-    Yaw,
-    Pitch,
-    Roll,
-    DOF_count
-};
-#endif
-
-OPENTRACK_EXPORT opentrack opentrack_make_ctx(int argc, char** argv, void* window_parent);
-OPENTRACK_EXPORT void opentrack_finalize_ctx(opentrack self);
-
-/* no need to free the return value; invalid to modify it */
-OPENTRACK_EXPORT const char** opentrack_enum_trackers(opentrack self);
-
-/*
- * don't `opentrack_tracker_tick an unstarted tracker, it's invalid to do so
- * it's also invalid to start a finalized tracker
- */
-OPENTRACK_EXPORT opentrack_tracker opentrack_make_tracker(opentrack ctx, const char* name);
-OPENTRACK_EXPORT void  opentrack_tracker_start(opentrack self, opentrack_tracker tracker);
-OPENTRACK_EXPORT void opentrack_tracker_tick(opentrack_tracker tracker, double* headpose);
-OPENTRACK_EXPORT void opentrack_finalize_tracker(opentrack_tracker tracker);
-#ifdef __cplusplus
-}
-#endif
-