diff options
| author | mm0zct <the_cartographer@hotmail.com> | 2013-10-21 21:14:05 +0100 |
|---|---|---|
| committer | mm0zct <the_cartographer@hotmail.com> | 2013-10-21 21:14:05 +0100 |
| commit | bfcfdb8827507de1091d6b92081a78eb8e4df9da (patch) | |
| tree | 2bc5dc67bfac87ae84009e0f16d2b0f36510a4e5 /ftnoir_tracker_base/ftnoir_tracker_base.h | |
| parent | 726875b0b40f8a43ae5ca763667dc707e84f39aa (diff) | |
| parent | 732644b87e4fbc999170d13f6cda179113d3940b (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack into feature/tracker_hotkeys
Conflicts:
TODO.txt
Diffstat (limited to 'ftnoir_tracker_base/ftnoir_tracker_base.h')
| -rw-r--r-- | ftnoir_tracker_base/ftnoir_tracker_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ftnoir_tracker_base/ftnoir_tracker_base.h b/ftnoir_tracker_base/ftnoir_tracker_base.h index 8b720620..84629547 100644 --- a/ftnoir_tracker_base/ftnoir_tracker_base.h +++ b/ftnoir_tracker_base/ftnoir_tracker_base.h @@ -44,7 +44,7 @@ struct ITracker virtual ~ITracker() = 0; virtual void StartTracker( QFrame* frame ) = 0; virtual bool GiveHeadPoseData(double *data) = 0; - virtual void HotkeyCallback(unsigned int *) = 0; +// virtual void HotkeyCallback(unsigned int *) = 0; }; inline ITracker::~ITracker() { } |