[protocols] Move leapmotion support out of there

ossia · May 14, 2024 · 8c04bfa · 8c04bfa
1 parent 0966d93
commit 8c04bfa
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 460 deletions.
diff --git a/cmake/FindLeapMotion.cmake b/cmake/FindLeapMotion.cmake
diff --git a/cmake/OssiaDeps.cmake b/cmake/OssiaDeps.cmake
@@ -199,14 +199,6 @@ if(OSSIA_PROTOCOL_LIBMAPPER)
   endif()
 endif()
 
-if(OSSIA_PROTOCOL_LEAPMOTION)
-  include(deps/leapmotion)
-
-  if(NOT LeapMotion_FOUND)
-    set(OSSIA_PROTOCOL_LEAPMOTION FALSE CACHE INTERNAL "")
-  endif()
-endif()
-
 if(OSSIA_ENABLE_FFT)
   if(OSSIA_ENABLE_FFTW)
     include(deps/fftw)

diff --git a/cmake/OssiaOptions.cmake b/cmake/OssiaOptions.cmake
@@ -61,7 +61,6 @@ option(OSSIA_PROTOCOL_HTTP "Enable HTTP protocol" ON) # Requires Qt
 option(OSSIA_PROTOCOL_WEBSOCKETS "Enable WebSockets protocol" OFF) # Requires Qt
 option(OSSIA_PROTOCOL_SERIAL "Enable Serial port protocol" OFF) # Requires Qt
 option(OSSIA_PROTOCOL_PHIDGETS "Enable Phidgets protocol" OFF) # Requires Phidgets library
-option(OSSIA_PROTOCOL_LEAPMOTION "Enable Leapmotion protocol" OFF) # Requires LeapMotion Orion library
 option(OSSIA_PROTOCOL_JOYSTICK "Enable Joystick protocol" ON)  # Requires SDL2 library
 option(OSSIA_PROTOCOL_WIIMOTE "Enable Wiimote Protocol" ON) #use wiiuse
 option(OSSIA_PROTOCOL_ARTNET "Enable artnet protocol" ON) #use libartnet
@@ -85,7 +84,6 @@ set(OSSIA_AVAILABLE_PROTOCOLS
   OSC MINUIT OSCQUERY
   HTTP WEBSOCKETS SERIAL
   PHIDGETS
-  LEAPMOTION
   JOYSTICK
   WIIMOTE
   ARTNET

diff --git a/cmake/deps/leapmotion.cmake b/cmake/deps/leapmotion.cmake
@@ -1 +0,0 @@
-find_package(LeapMotion)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -72,9 +72,7 @@ if(OSSIA_PROTOCOL_OSCQUERY)
   ossia_add_example(network_oscquery_recorder "${CMAKE_CURRENT_SOURCE_DIR}/Network/asio/OSCQuery_recorder.cpp")
 
   ossia_add_example(pd_controller "${CMAKE_CURRENT_SOURCE_DIR}/Network/PdController.cpp")
-  if(OSSIA_PROTOCOL_LEAPMOTION)
-    ossia_add_example(network_leapmotion_oscquery "${CMAKE_CURRENT_SOURCE_DIR}/Network/LeapToOscQuery.cpp")
-  endif()
+
   if(OSSIA_PROTOCOL_LIBMAPPER)
     ossia_add_example(network_libmapper "${CMAKE_CURRENT_SOURCE_DIR}/Network/Libmapper.cpp")
   endif()

diff --git a/examples/Network/LeapToOscQuery.cpp b/examples/Network/LeapToOscQuery.cpp
@@ -1,18 +0,0 @@
-#include <ossia/network/local/local.hpp>
-#include <ossia/network/oscquery/oscquery_server.hpp>
-#include <ossia/protocols/leapmotion/leapmotion_device.hpp>
-
-int main()
-{
-  auto ctx = ossia::net::create_network_context();
-  auto proto = std::make_unique<ossia::net::multiplex_protocol>();
-  auto& multiplex = *proto;
-  ossia::net::generic_device leap{std::move(proto), "leapmotion"};
-  leap.set_echo(true);
-
-  multiplex.expose_to(
-      std::make_unique<ossia::oscquery::oscquery_server_protocol>(15554, 1349));
-  multiplex.expose_to(std::make_unique<ossia::leapmotion_protocol>(ctx));
-
-  ossia::net::run_network_context(*ctx);
-}

diff --git a/src/ossia-config.hpp.in b/src/ossia-config.hpp.in
@@ -13,12 +13,9 @@
 #cmakedefine OSSIA_PROTOCOL_HTTP
 #cmakedefine OSSIA_PROTOCOL_WEBSOCKETS
 #cmakedefine OSSIA_PROTOCOL_SERIAL
-#cmakedefine OSSIA_PROTOCOL_PHIDGETS
-#cmakedefine OSSIA_PROTOCOL_LEAPMOTION
 #cmakedefine OSSIA_PROTOCOL_JOYSTICK
 #cmakedefine OSSIA_PROTOCOL_WIIMOTE
 #cmakedefine OSSIA_PROTOCOL_ARTNET
-#cmakedefine OSSIA_PROTOCOL_LIBMAPPER
 
 // Additional features
 #cmakedefine OSSIA_DNSSD

diff --git a/src/ossia-max/src/device.cpp b/src/ossia-max/src/device.cpp
@@ -26,9 +26,6 @@
 #if defined(OSSIA_PROTOCOL_PHIDGETS)
 #include <ossia/network/phidgets/phidgets_protocol.hpp>
 #endif
-#if defined(OSSIA_PROTOCOL_LEAPMOTION)
-#include <ossia/network/leapmotion/leapmotion_device.hpp>
-#endif
 
 using namespace ossia::max_binding;
 
@@ -477,13 +474,6 @@ void device::expose(device* x, t_symbol*, long argc, t_atom* argv)
     }
 #endif
 
-#if defined(OSSIA_PROTOCOL_LEAPMOTION)
-    else if(protocol == "leapmotion")
-    {
-      multiplex.expose_to(std::make_unique<ossia::leapmotion_protocol>());
-    }
-#endif
-
     else
     {
       object_error((t_object*)x, "Unknown protocol: %s", protocol.c_str());