declutter stuff outta UI class

2 files changed, 4 insertions, 18 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 4c074e6e..c547f608 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -25,10 +25,7 @@
 #include "opentrack/tracker.h"
 #include <QFileDialog>
 
-FaceTrackNoIR::FaceTrackNoIR() : QMainWindow(nullptr),
-    b(bundle("opentrack-ui")),
-    s(b),
-    pose(std::vector<axis_opts*>{&s.a_x, &s.a_y, &s.a_z, &s.a_yaw, &s.a_pitch, &s.a_roll}),
+FaceTrackNoIR::FaceTrackNoIR() :
     timUpdateHeadPose(this),
     kbd_quit(QKeySequence("Ctrl+Q"), this),
     no_feed_pixmap(":/uielements/no-feed.png")
diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h
index 13c2bb59..c90b33f6 100644
--- a/facetracknoir/facetracknoir.h
+++ b/facetracknoir/facetracknoir.h
@@ -50,39 +50,28 @@
 #include "opentrack/tracker.h"
 #include "opentrack/shortcuts.h"
 #include "opentrack/work.hpp"
+#include "opentrack/state.hpp"
 #include "curve-config.h"
 
 using namespace options;
 
-class FaceTrackNoIR : public QMainWindow
+class FaceTrackNoIR : public QMainWindow, private State
 {
     Q_OBJECT
-public:
-    pbundle b;
-    main_settings s;
-private:
-    // XXX move the shit outta the _widget_, establish a class
-    // for running tracker state, etc -sh 20141014
-    Mappings pose;
     Ui::OpentrackUI ui;
     
     QTimer timUpdateHeadPose;
     
-    SelectedLibraries libs;
-    ptr<Work> work;
-
     ptr<KeyboardShortcutDialog> shortcuts_widget;
     ptr<MapWidget> mapping_widget;
     
     QShortcut kbd_quit;
     QPixmap no_feed_pixmap;
+    
     ptr<IFilterDialog> pFilterDialog;
     ptr<IProtocolDialog> pProtocolDialog;
     ptr<ITrackerDialog> pTrackerDialog;
-    Modules modules;
     
-    // XXX this shit stinks -sh 20141004
-    // TODO move to separate class representing running tracker state
     ptr<dylib> current_tracker()
     {
         return modules.trackers().value(ui.iconcomboTrackerSource->currentIndex(), nullptr);