diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-16 09:20:06 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-16 09:20:06 +0200 |
| commit | e4e564d4b8c43986e925996aca8cf10c6b30136e (patch) | |
| tree | 54d414e8a54d6af444dbfb10d15a66a07a9d97da /ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h | |
| parent | d4a35684220c9e06b64ce3d39df06616f0147bdc (diff) | |
| parent | 4c5c3904a55a748f3453f5b067e2d6d0f0a11848 (diff) | |
Merge branch 'unstable' of github.com:opentrack/opentrack into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h')
| -rw-r--r-- | ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h index fba755bd..30647412 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h @@ -13,7 +13,7 @@ #include "opentrack/options.hpp" using namespace options; -struct settings : opts +struct settings_pt : opts { value<QString> camera_name; value<int> cam_res_x, @@ -36,7 +36,7 @@ struct settings : opts value<bool> dynamic_pose; - settings() : + settings_pt() : opts("tracker-pt"), camera_name(b, "camera-name", ""), cam_res_x(b, "camera-res-width", 640), |