diff --git a/Bin/C++/EasyPlayer-RTSP.exe b/Bin/C++/EasyPlayer-RTSP.exe index e416b20..841de47 100644 Binary files a/Bin/C++/EasyPlayer-RTSP.exe and b/Bin/C++/EasyPlayer-RTSP.exe differ diff --git a/Bin/C++/EasyPlayer-RTSPWebActiveX.ocx b/Bin/C++/EasyPlayer-RTSPWebActiveX.ocx index 3765aff..28fc1e9 100644 Binary files a/Bin/C++/EasyPlayer-RTSPWebActiveX.ocx and b/Bin/C++/EasyPlayer-RTSPWebActiveX.ocx differ diff --git a/Bin/C++/Main_config.xml b/Bin/C++/Main_config.xml index c56d59a..418d137 100644 --- a/Bin/C++/Main_config.xml +++ b/Bin/C++/Main_config.xml @@ -4,8 +4,8 @@ - - + + diff --git a/Bin/C++/libEasyPlayer-RTSP.dll b/Bin/C++/libEasyPlayer-RTSP.dll index ced2e3f..fd25132 100644 Binary files a/Bin/C++/libEasyPlayer-RTSP.dll and b/Bin/C++/libEasyPlayer-RTSP.dll differ diff --git a/Src/C++/EasyPlayer/EasyPlayerDlg.cpp b/Src/C++/EasyPlayer/EasyPlayerDlg.cpp index 0f45c87..c29ec96 100644 --- a/Src/C++/EasyPlayer/EasyPlayerDlg.cpp +++ b/Src/C++/EasyPlayer/EasyPlayerDlg.cpp @@ -125,7 +125,10 @@ BOOL CEasyPlayerDlg::OnInitDialog() // TODO: ڴӶijʼ CString strValidTime; - strValidTime.Format(_T("Ȩʣʱ %d "), m_nValidTimes); + if(m_nValidTimes == EASY_ACTIVATE_SUCCESS) + strValidTime.Format(_T("EasyPlayer߰棬ѣ")); + else + strValidTime.Format(_T("Ȩʣʱ %d "), m_nValidTimes); SetString(4, strValidTime ); CreateComponents(); diff --git a/Src/C++/libEasyPlayer/libEasyPlayerAPI.cpp b/Src/C++/libEasyPlayer/libEasyPlayerAPI.cpp index 596e6a9..85f932b 100644 --- a/Src/C++/libEasyPlayer/libEasyPlayerAPI.cpp +++ b/Src/C++/libEasyPlayer/libEasyPlayerAPI.cpp @@ -14,29 +14,6 @@ CChannelManager *g_pChannelManager = NULL; LIB_EASYPLAYER_API int EasyPlayer_Init(char* key) { int isEasyRTSPClientActivated = EasyRTSP_Activate(key); -#if 0 - switch(isEasyRTSPClientActivated) - { - case EASY_ACTIVATE_INVALID_KEY: - printf("EasyRTSPClient_KEY is EASY_ACTIVATE_INVALID_KEY!\n"); - break; - case EASY_ACTIVATE_TIME_ERR: - printf("EasyRTSPClient_KEY is EASY_ACTIVATE_TIME_ERR!\n"); - break; - case EASY_ACTIVATE_PROCESS_NAME_LEN_ERR: - printf("EasyRTSPClient_KEY is EASY_ACTIVATE_PROCESS_NAME_LEN_ERR!\n"); - break; - case EASY_ACTIVATE_PROCESS_NAME_ERR: - printf("EasyRTSPClient_KEY is EASY_ACTIVATE_PROCESS_NAME_ERR!\n"); - break; - case EASY_ACTIVATE_VALIDITY_PERIOD_ERR: - printf("EasyRTSPClient_KEY is EASY_ACTIVATE_VALIDITY_PERIOD_ERR!\n"); - break; - case EASY_ACTIVATE_SUCCESS: - printf("EasyRTSPClient_KEY is EASY_ACTIVATE_SUCCESS!\n"); - break; - } -#endif if(isEasyRTSPClientActivated <= 0) return isEasyRTSPClientActivated;