diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-03-13 23:41:52 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-03-13 23:41:52 +0100 |
| commit | c1a76c75df5ae4f0624d8456b336ecee2514c357 (patch) | |
| tree | 8730bddac3ab487ef416a941ae90a6f38f1b1866 /opentrack | |
| parent | 2706e1e10d324971f7c3991de0fff1fcc716fb00 (diff) | |
initialize "s_main" bundle implicitly
Diffstat (limited to 'opentrack')
| -rw-r--r-- | opentrack/main-settings.hpp | 4 | ||||
| -rw-r--r-- | opentrack/shortcuts.h | 3 | ||||
| -rw-r--r-- | opentrack/state.hpp | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/opentrack/main-settings.hpp b/opentrack/main-settings.hpp index 971e0fba..0468aeb1 100644 --- a/opentrack/main-settings.hpp +++ b/opentrack/main-settings.hpp @@ -30,8 +30,8 @@ struct main_settings { value<bool> tray_enabled; value<int> camera_yaw, camera_pitch; value<bool> center_at_startup; - main_settings(pbundle b) : - b(b), + main_settings() : + b(bundle("opentrack-ui")), tracker_dll(b, "tracker-dll", ""), tracker2_dll(b, "tracker2-dll", ""), filter_dll(b, "filter-dll", ""), diff --git a/opentrack/shortcuts.h b/opentrack/shortcuts.h index 6989ea29..4d4b19d3 100644 --- a/opentrack/shortcuts.h +++ b/opentrack/shortcuts.h @@ -112,8 +112,7 @@ public: b(bundle("keyboard-shortcuts")), center(b, "center"), toggle(b, "toggle"), - zero(b, "zero"), - s_main(bundle("opentrack-ui")) + zero(b, "zero") {} } s; diff --git a/opentrack/state.hpp b/opentrack/state.hpp index c8d97d16..2c37e5eb 100644 --- a/opentrack/state.hpp +++ b/opentrack/state.hpp @@ -35,13 +35,10 @@ struct Work; struct State { State() : - 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}) {} Modules modules; SelectedLibraries libs; - pbundle b; main_settings s; Mappings pose; mem<Work> work; |