diff options
Diffstat (limited to 'ftnoir_protocol_ft/ftnoir_protocol_ft.h')
| -rw-r--r-- | ftnoir_protocol_ft/ftnoir_protocol_ft.h | 42 | 
1 files changed, 15 insertions, 27 deletions
| diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h index c82c3e79..690984a4 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h @@ -28,21 +28,21 @@  #ifndef INCLUDED_FTSERVER_H
  #define INCLUDED_FTSERVER_H
 -#include "..\ftnoir_protocol_base\ftnoir_protocol_base.h"
 -#include "ui_FTNoIR_FTcontrols.h"
 -#include "FTTypes.h"
 +#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
 +#include "ui_ftnoir_ftcontrols.h"
 +#include "fttypes.h"
  #include <QMessageBox>
  #include <QSettings>
  #include <QLibrary>
  #include <QProcess>
  #include <QDebug>
  #include <QFile>
 -#include "Windows.h"
 +#include <windows.h>
 +// todo wine glue
  //#include "math.h"
 +#include "facetracknoir/global-settings.h"
 -//typedef char *(WINAPI *importProvider)(void);
 -typedef void (WINAPI *importTIRViewsStart)(void);
 -typedef void (WINAPI *importTIRViewsStop)(void);
 +typedef char *(WINAPI *importProvider)(void);
  class FTNoIR_Protocol : public IProtocol
  {
 @@ -53,35 +53,25 @@ public:  	void Release();
      void Initialize();
 -	bool checkServerInstallationOK( HANDLE handle );
 +    bool checkServerInstallationOK();
  	void sendHeadposeToGame( THeadPoseData *headpose, THeadPoseData *rawheadpose );
  	void getNameFromGame( char *dest );					// Take care dest can handle up to 100 chars...
  private:
 -	bool FTCreateMapping(HANDLE handle);
 +    bool FTCreateMapping();
  	void FTDestroyMapping();
 -	importTIRViewsStart viewsStart;						// Functions inside TIRViews.dll
 -	importTIRViewsStop viewsStop;
 -
  	HANDLE hFTMemMap;
  	FTMemMap *pMemData;
  	HANDLE hFTMutex;
 -	HANDLE hMainWindow;									// Save the handle to FaceTrackNoIR main-window
  	__int32 comhandle;									// Handle on x32, command on x64
  	// Private properties
  	QString ProgramName;
 -	QLibrary FTIRViewsLib;
 -	QProcess *dummyTrackIR;
 -	int intGameID;
 -	int intUsedInterface;								// Determine which interface to use (or to hide from the game)
 -	bool useTIRViews;									// Needs to be in the Settings dialog
 -	bool useDummyExe;
 +	QLibrary FTClientLib;
  	float getRadsFromDegrees ( float degrees ) { return (degrees * 0.017453f); }
 -	bool getGameData( QString gameID );
  	void loadSettings();
  };
 @@ -115,27 +105,25 @@ private:  	FTNoIR_Protocol *theProtocol;
  private slots:
 -	void selectDLL();
  	void doOK();
  	void doCancel();
  	void settingChanged() { settingsDirty = true; };
 -	void settingChanged(int) { settingsDirty = true; };
  };
  //*******************************************************************************************************
  // FaceTrackNoIR Protocol DLL. Functions used to get general info on the Protocol
  //*******************************************************************************************************
 -class FTNoIR_ProtocolDll : public IProtocolDll
 +class FTNoIR_ProtocolDll : public Metadata
  {
  public:
  	FTNoIR_ProtocolDll();
  	~FTNoIR_ProtocolDll();
 -	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FreeTrack 2.0"); };
 -	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FreeTrack 2.0"); };
 -	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Enhanced FreeTrack protocol"); };
 +	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FreeTrack"); };
 +	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FreeTrack"); };
 +	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("FreeTrack protocol"); };
 -	void getIcon(QIcon *icon) { *icon = QIcon(":/images/Freetrack.ico"); };
 +    void getIcon(QIcon *icon) { *icon = QIcon(":/images/freetrack.png"); };
  };
 | 
