Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

简化命名空间

Browse Source
This commit is contained in:
xiongziliang
2018-10-24 17:17:55 +08:00
parent ed1402e9d6
commit 9f16cc1201
133 changed files with 446 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/DeviceHK/DeviceHK.cpp
View File

@@ -27,8 +27,7 @@
#include "DeviceHK.h"
#include "Util/TimeTicker.h"
#include "Util/MD5.h"
namespace ZL {
namespace DEV {
namespace mediakit {
#define HK_APP_NAME "live"
@@ -261,7 +260,6 @@ void DevChannelHK::onGetDecData(char* pBuf, int nSize, FRAME_INFO* pFrameInfo) {
}
}
} /* namespace DEV */
} /* namespace ZL */
} /* namespace mediakit */
#endif //ENABLE_HKDEVICE

8
tests/DeviceHK/DeviceHK.h
View File

@@ -35,10 +35,9 @@
#include "Util/logger.h"
#include "Util/TimeTicker.h"
using namespace ZL::Util;
using namespace toolkit;
namespace ZL {
namespace DEV {
namespace mediakit {
class connectInfo {
public:
@@ -130,7 +129,6 @@ protected:
bool m_bAudioSeted = false;
};
} /* namespace DEV */
} /* namespace ZL */
} /* namespace mediakit */
#endif /* DEVICE_DEVICEHK_H_ */