diff --git a/ECTrainer2/ECTrainer.h b/ECTrainer2/ECTrainer.h index dcdb4a0..c51a79e 100644 --- a/ECTrainer2/ECTrainer.h +++ b/ECTrainer2/ECTrainer.h @@ -3,9 +3,8 @@ #include #include #include -//#include "GOpenCV.h" -#define ADDR "192.168.71.50" +#define TOBII_ADDR "192.168.71.50" #define EYEDEVICE_GLASS2 //#define EYEDEVICE_NONE diff --git a/ECTrainer2/KeepAlive.cpp b/ECTrainer2/KeepAlive.cpp index 771a3f5..d3f79bc 100644 --- a/ECTrainer2/KeepAlive.cpp +++ b/ECTrainer2/KeepAlive.cpp @@ -34,7 +34,7 @@ // setup address structure _socketAddr.sin_family = AF_INET; _socketAddr.sin_port = htons(PORT); - InetPton(_socketAddr.sin_family, _T(ADDR), &_socketAddr.sin_addr.S_un.S_addr); + InetPton(_socketAddr.sin_family, _T(TOBII_ADDR), &_socketAddr.sin_addr.S_un.S_addr); #endif diff --git a/ECTrainer2/SceneCamera.cpp b/ECTrainer2/SceneCamera.cpp index ea49356..c26e875 100644 --- a/ECTrainer2/SceneCamera.cpp +++ b/ECTrainer2/SceneCamera.cpp @@ -17,12 +17,12 @@ bool SceneCamera::Init() { // ���E�J�����ɐڑ� #if defined(EYEDEVICE_GLASS2) - _SceneCam.open("rtsp://" ADDR ":8554/live/scene"); + _SceneCam.open("rtsp://" TOBII_ADDR ":8554/live/scene"); #elif defined(EYEDEVICE_NONE) _SceneCam.open(0); #endif if (!_SceneCam.isOpened()) { - MessageBox(NULL, _T("cannot open camera " ADDR), NULL, 0); + MessageBox(NULL, _T("cannot open camera " TOBII_ADDR), NULL, 0); return false; } // �摜�T�C�Y��ۑ� diff --git a/ECTrainer2/TobiiREST.h b/ECTrainer2/TobiiREST.h index d1113ff..812d573 100644 --- a/ECTrainer2/TobiiREST.h +++ b/ECTrainer2/TobiiREST.h @@ -3,7 +3,7 @@ #include "REST_Handler.h" #include "BaseProcess.h" -#define SERVER _T("http://192.168.71.50") +#define SERVER _T("http://" TOBII_ADDR) class TobiiREST : public BaseProcess {