merge in the right hatire branch this time!

Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>

1 files changed, 51 insertions, 8 deletions

diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp
index cd1475f8..5f82d5a0 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp
@@ -1,38 +1,81 @@
+/********************************************************************************
+* FaceTrackNoIR		This program is a private project of some enthusiastic		*
+*					gamers from Holland, who don't like to pay much for			*
+*					head-tracking.												*
+*																				*
+* Copyright (C) 2012	Wim Vriend (Developing)									*
+*						Ron Hendriks (Researching and Testing)					*
+* Homepage:			http://facetracknoir.sourceforge.net/home/default.htm		*
+*																				*
+* Copyright (C) 2012	FuraX49 (HAT Tracker plugins)	    	     			*
+* Homepage:			http://hatire.sourceforge.net								*
+*																				*
+* This program is free software; you can redistribute it and/or modify it		*
+* under the terms of the GNU General Public License as published by the			*
+* Free Software Foundation; either version 3 of the License, or (at your		*
+* option) any later version.													*
+*																				*
+* This program is distributed in the hope that it will be useful, but			*
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
+* more details.																	*
+*																				*
+* You should have received a copy of the GNU General Public License along		*
+* with this program; if not, see <http://www.gnu.org/licenses/>.				*
+*																				*
+********************************************************************************/
+
 #include "ftnoir_tracker_hat.h"
 #include <QIcon>
 #include <QDebug>
 
-FTNoIR_TrackerDll::FTNoIR_TrackerDll() {
+TrackerDll::TrackerDll() {
+	//populate the description strings
     trackerFullName = "Hatire Arduino";
 	trackerShortName = "HAT";
-    trackerDescription = "Hatire Arduino";
+	trackerDescription = "FaceTrackNoIR HAT";
 }
 
-FTNoIR_TrackerDll::~FTNoIR_TrackerDll()
+TrackerDll::~TrackerDll()
 {
+
 }
 
-void FTNoIR_TrackerDll::getFullName(QString *strToBeFilled)
+void TrackerDll::getFullName(QString *strToBeFilled)
 {
 	*strToBeFilled = trackerFullName;
 }
 
-void FTNoIR_TrackerDll::getShortName(QString *strToBeFilled)
+void TrackerDll::getShortName(QString *strToBeFilled)
 {
 	*strToBeFilled = trackerShortName;
 }
 
-void FTNoIR_TrackerDll::getDescription(QString *strToBeFilled)
+void TrackerDll::getDescription(QString *strToBeFilled)
 {
 	*strToBeFilled = trackerDescription;
 }
 
-void FTNoIR_TrackerDll::getIcon(QIcon *icon)
+void TrackerDll::getIcon(QIcon *icon)
 {
     *icon = QIcon(":/images/hat.png");
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Factory function that creates instances if the Tracker object.
+
+// Export both decorated and undecorated names.
+//   GetTrackerDll     - Undecorated name, which can be easily used with GetProcAddress
+//						Win32 API function.
+//   _GetTrackerDll@0  - Common name decoration for __stdcall functions in C language.
+
+#ifdef OPENTRACK_API
+#   include "facetracknoir/global-settings.h"
 extern "C" FTNOIR_TRACKER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+#else
+#   pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")
+FTNOIR_TRACKER_BASE_EXPORT ITrackerDllPtr __stdcall GetTrackerDll()
+#endif
 {
-	return new FTNoIR_TrackerDll;
+	return new TrackerDll;
 }