Merge branch 'unstable' into trackhattrackhat-1.1p2

* unstable:
  cmake: update toolchain file
  shortcuts: fix osx/linux keystrokes persisting
  cmake: fix copy-paste comment
  cmake: add toolchain file for OSX
  cmake: add osx policy to make it shutup
  x-plane: ignore diagnostic
  osx: nix warning
  gitattributes: more text extensions to eol=lf
  cmake: timestamp logic simplify/fix
  cmake: no timestamp for tag builds
  all: update copyright where appropriate
  all: comments only
  cmake: regen before making tarball
  cmake: fix dropbox share invocation
  tracker: initialize newpose
  pt: use previous pose on NaN result from POSIT
  accela: also don't poison ewma state with nans
  cmake: fix tarball invocation
  accela: elide NaN output values
  qfc: elide NaN values
  pt: reformat more
  pt: reformat posit
  pt: refactor auto threshold somewhat
  pt: rename ill-chosen name
  pt: switch min/max point size to reals
  cmake: upload tarball to Dropbox but only if I'm the user
  cmake: add tarball timestamp so it gets rebuilt
  cmake: don't regen version if none changed
  cmake: fix git describe --dirty
  cmake: retab git module
  fix tarball target
  cmake: mark dirty tree
  cmake: regen tarball even if exists
  cmake: generate version.cc
  tracker: check for NaN values
  accela: don't check NaNs in filter, wrong place
  cmake: drop -ffast-math, allow for NaN check
  shortcuts: actually print screen binding works
  shortcuts: alias right modifier keys to left modifier keys
  shortcuts: allow for binding scroll lock and pause/break
  accela: also filter out NaNs on tracking start
  allow for filter immediate center

1 files changed, 15 insertions, 11 deletions

diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
index 5d7ab778..0c6cb486 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
@@ -1,9 +1,13 @@
-/* Copyright (c) 2015 Stanislaw Halik <sthalik@misaki.pl>
- * Copyright (c) 2015 Wim Vriend
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+/* Homepage         http://facetracknoir.sourceforge.net/home/default.htm        *
+ *                                                                               *
+ * ISC License (ISC)                                                             *
+ *                                                                               *
+ * Copyright (c) 2015, Wim Vriend
+ * Copyright (c) 2014, Stanislaw Halik <sthalik@misaki.pl>
+ *                                                                               *
+ * Permission to use, copy, modify, and/or distribute this software for any      *
+ * purpose with or without fee is hereby granted, provided that the above        *
+ * copyright notice and this permission notice appear in all copies.             *
  */
 #include "ftnoir_protocol_sc.h"
 #include "opentrack/plugin-api.hpp"
@@ -80,7 +84,7 @@ public:
 #	define PREFIX ""
 #else
 #	define PREFIX "lib"
-#endif 
+#endif
         QString path = QCoreApplication::applicationDirPath() + "/" PREFIX "opentrack-proto-simconnect.dll";
         QByteArray name = QFile::encodeName(path);
         actx.lpSource = name.constData();
@@ -113,11 +117,11 @@ private:
 };
 
 bool FTNoIR_Protocol::correct()
-{   
-    if (!SCClientLib.isLoaded())                           
+{
+    if (!SCClientLib.isLoaded())
     {
         ActivationContext ctx(142 + static_cast<int>(s.sxs_manifest));
-        
+
         if (ctx.is_ok())
         {
             SCClientLib.setFileName("SimConnect.dll");
@@ -171,7 +175,7 @@ void FTNoIR_Protocol::handle()
 void CALLBACK FTNoIR_Protocol::processNextSimconnectEvent(SIMCONNECT_RECV* pData, DWORD, void *self_)
 {
     FTNoIR_Protocol& self = *reinterpret_cast<FTNoIR_Protocol*>(self_);
-    
+
     switch(pData->dwID)
     {
     default: