summaryrefslogtreecommitdiffhomepage
path: root/video-ps3eye/module.hpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2020-06-13 02:25:31 +0200
committerStanislaw Halik <sthalik@misaki.pl>2020-06-13 02:25:31 +0200
commit9a959381f412bbc8e761cdceb9237aa5ba664e48 (patch)
tree87d43a60c53697dd29b135c938fd73536df86e11 /video-ps3eye/module.hpp
parent5adb85b446cd02d89e3b0b216b7e13b4c255704f (diff)
Revert "video/ps3eye: don't reset sensor that much"
Causes lag and eventually crashes in Qt timer subsystem. This reverts commit 58d857673ed0fdd801da53b7c7b6dec1dc26d60a.
Diffstat (limited to 'video-ps3eye/module.hpp')
-rw-r--r--video-ps3eye/module.hpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/video-ps3eye/module.hpp b/video-ps3eye/module.hpp
index 955463d6..56ffe5df 100644
--- a/video-ps3eye/module.hpp
+++ b/video-ps3eye/module.hpp
@@ -8,8 +8,8 @@
#include "compat/timer.hpp"
#include "ui_dialog.h"
+#include <QDialog>
#include <QProcess>
-#include <QTimer>
using namespace options;
@@ -27,7 +27,6 @@ struct settings final
void set_exposure();
void set_gain();
- void apply();
};
class dialog final : public QWidget
@@ -36,15 +35,13 @@ class dialog final : public QWidget
Ui_Dialog ui;
settings s;
- QTimer t;
-
shm_wrapper shm { "ps3eye-driver-shm", nullptr, sizeof(ps3eye::shm) };
- void do_ok() { s.b->save(); s.apply(); close(); }
- void do_cancel() { s.b->reload(); s.apply(); close(); }
+ void do_ok() { s.b->save(); close(); deleteLater(); }
+ void do_cancel() { s.b->reload(); close(); deleteLater(); }
protected:
- void closeEvent(QCloseEvent*) override { do_cancel(); deleteLater(); }
+ void closeEvent(QCloseEvent*) override { do_cancel(); }
public:
explicit dialog(QWidget* parent = nullptr);