diff --git a/include/convert.h b/include/convert.h index c02f9e2..2df3dd1 100644 --- a/include/convert.h +++ b/include/convert.h @@ -1,7 +1,7 @@ #ifndef CONVERT_H #define CONVERT_H #include -#include +#include "HCNetSDK.h" using namespace std; void convert_str_chararr(string src, char *dst, int dstlen); void convert_isotimestr_time(string timestr, int timezone, LPNET_DVR_TIME time); diff --git a/src/HkStreamer.cpp b/src/HkStreamer.cpp index 2cd95fa..871ff8c 100644 --- a/src/HkStreamer.cpp +++ b/src/HkStreamer.cpp @@ -3,13 +3,12 @@ #include #include #include -#include "HCNetSDK.h" -#include "HkStreamer.h" -#include "convert.h" +#include "../include/HCNetSDK.h" +#include "../include/HkStreamer.h" +#include "../include/convert.h" using namespace std; const int outcache_size=1024; -void CALLBACK fPlayDataCallBack(LONG lPlayHandle, DWORD dwDataType, BYTE *pBuffer, DWORD dwBufSize, void* dwUser) -{ +void CALLBACK fPlayDataCallBack(LONG lPlayHandle, DWORD dwDataType, BYTE *pBuffer, DWORD dwBufSize, void* dwUser){ DWORD remained = dwBufSize; char cache[outcache_size]={0}; BYTE *cp; // cp head point diff --git a/src/cmdlineparser.cpp b/src/cmdlineparser.cpp index 0a373d6..6991ff3 100644 --- a/src/cmdlineparser.cpp +++ b/src/cmdlineparser.cpp @@ -1,7 +1,7 @@ -#include "cmdlineparser.h" +#include "../include/cmdlineparser.h" #include #include "string.h" -#include "convert.h" + using namespace std; template bool mapHasKey(map *pMap, int key){ diff --git a/src/convert.cpp b/src/convert.cpp index c57bae0..e801aa6 100644 --- a/src/convert.cpp +++ b/src/convert.cpp @@ -1,7 +1,7 @@ -#include "convert.h" +#include "../include/convert.h" #include #include -#include +#include "../include/HCNetSDK.h" #include "time.h" using namespace std; diff --git a/src/main.cpp b/src/main.cpp index 12b85ec..efa119a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,10 +1,10 @@ -#include "HkStreamer.h" +#include "../include/HkStreamer.h" #include #include #include #include #include -#include "cmdlineparser.h" +#include "../include/cmdlineparser.h" using namespace std; void error(string msg)