From 8e022f0d1ad5628c2bf9a97a16b16fd1cff5196c Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 18 Jun 2015 10:43:31 +0200
Subject: minor fixes now

---
 opentrack/main-settings.hpp  |  4 +---
 opentrack/plugin-support.hpp | 13 ++++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'opentrack')

diff --git a/opentrack/main-settings.hpp b/opentrack/main-settings.hpp
index f47b3873..8e56ebab 100644
--- a/opentrack/main-settings.hpp
+++ b/opentrack/main-settings.hpp
@@ -21,7 +21,7 @@ private:
 };
 
 struct main_settings : opts {
-    value<QString> tracker_dll, filter_dll, protocol_dll;
+    value<QString> protocol_dll;
     axis_opts a_x, a_y, a_z, a_yaw, a_pitch, a_roll;
     value<bool> tcomp_p, tcomp_tz;
     value<bool> tray_enabled;
@@ -29,8 +29,6 @@ struct main_settings : opts {
     value<bool> center_at_startup;
     main_settings() :
         opts("opentrack-ui"),
-        tracker_dll(b, "tracker-dll", ""),
-        filter_dll(b, "filter-dll", ""),
         protocol_dll(b, "protocol-dll", ""),
         a_x(b, "x", TX),
         a_y(b, "y", TY),
diff --git a/opentrack/plugin-support.hpp b/opentrack/plugin-support.hpp
index bc07c106..1c334e14 100644
--- a/opentrack/plugin-support.hpp
+++ b/opentrack/plugin-support.hpp
@@ -52,7 +52,7 @@ extern "C" typedef void* (*OPENTRACK_CTOR_FUNPTR)(void);
 extern "C" typedef Metadata* (*OPENTRACK_METADATA_FUNPTR)(void);
 
 struct dylib {
-    enum Type { Filter, Tracker, Protocol };
+    enum Type { Protocol };
     
     dylib(const QString& filename, Type t) :
         type(t),
@@ -159,17 +159,14 @@ struct dylib {
     
     static QList<mem<dylib>> enum_libraries()
     {
-        const char* filters_n[] = { "opentrack-filter-*.",
-                                    "opentrack-tracker-*.",
-                                    "opentrack-proto-*."
-                                  };
-        const Type filters_t[] = { Filter, Tracker, Protocol };
+        const char* filters_n[] = { "opentrack-proto-*." };
+        const Type filters_t[] = { Protocol };
     
         QDir settingsDir( QCoreApplication::applicationDirPath() );
     
         QList<mem<dylib>> ret;
     
-        for (int i = 0; i < 3; i++)
+        for (int i = 0; i < 1; i++)
         {
             QString filter = filters_n[i];
             auto t = filters_t[i];
@@ -223,8 +220,6 @@ private:
 struct Modules {
     Modules() :
         module_list(dylib::enum_libraries()),
-        filter_modules(filter(dylib::Filter)),
-        tracker_modules(filter(dylib::Tracker)),
         protocol_modules(filter(dylib::Protocol))
     {}
     QList<mem<dylib>>& filters() { return filter_modules; }
-- 
cgit v1.2.3