diff --git a/src/Common/config.cpp b/src/Common/config.cpp index e870bcc5..c1613af0 100644 --- a/src/Common/config.cpp +++ b/src/Common/config.cpp @@ -262,7 +262,7 @@ const string kDeleteDelaySec = HLS_FIELD"deleteDelaySec"; static onceToken token([](){ mINI::Instance()[kSegmentDuration] = 2; mINI::Instance()[kSegmentNum] = 3; - mINI::Instance()[kSegmentKeep] = 0; + mINI::Instance()[kSegmentKeep] = false; mINI::Instance()[kSegmentRetain] = 5; mINI::Instance()[kFileBufSize] = 64 * 1024; mINI::Instance()[kFilePath] = "./www"; diff --git a/src/Record/HlsMaker.cpp b/src/Record/HlsMaker.cpp index 358fecb1..df92ca74 100644 --- a/src/Record/HlsMaker.cpp +++ b/src/Record/HlsMaker.cpp @@ -14,7 +14,7 @@ using namespace std; namespace mediakit { -HlsMaker::HlsMaker(float seg_duration, uint32_t seg_number, uint32_t seg_keep) { +HlsMaker::HlsMaker(float seg_duration, uint32_t seg_number, bool seg_keep) { //最小允许设置为0,0个切片代表点播 _seg_number = seg_number; _seg_duration = seg_duration; @@ -106,7 +106,7 @@ void HlsMaker::delOldSegment() { if (_file_index > _seg_number) { _seg_dur_list.pop_front(); } - if (_seg_keep == 1) { + if (_seg_keep) { //如果设置为一直保存,就不删除 return; } @@ -154,7 +154,7 @@ bool HlsMaker::isLive() { } bool HlsMaker::isKeep() { - return _seg_keep == 1; + return _seg_keep; } void HlsMaker::clear() { _file_index = 0; diff --git a/src/Record/HlsMaker.h b/src/Record/HlsMaker.h index 7db62c58..ea972d60 100644 --- a/src/Record/HlsMaker.h +++ b/src/Record/HlsMaker.h @@ -28,7 +28,7 @@ public: * @param seg_number 切片个数 * @param seg_keep 是否保留切片文件 */ - HlsMaker(float seg_duration = 5, uint32_t seg_number = 3, uint32_t seg_keep = 0); + HlsMaker(float seg_duration = 5, uint32_t seg_number = 3, bool seg_keep = false); virtual ~HlsMaker(); /** @@ -113,7 +113,7 @@ private: private: float _seg_duration = 0; uint32_t _seg_number = 0; - uint32_t _seg_keep = 0; + bool _seg_keep = false; uint32_t _last_timestamp = 0; uint32_t _last_seg_timestamp = 0; uint64_t _file_index = 0; diff --git a/src/Record/HlsMakerImp.cpp b/src/Record/HlsMakerImp.cpp index aabaeebc..cde0f129 100644 --- a/src/Record/HlsMakerImp.cpp +++ b/src/Record/HlsMakerImp.cpp @@ -24,7 +24,7 @@ HlsMakerImp::HlsMakerImp(const string &m3u8_file, uint32_t bufSize, float seg_duration, uint32_t seg_number, - uint32_t seg_keep):HlsMaker(seg_duration, seg_number, seg_keep) { + bool seg_keep):HlsMaker(seg_duration, seg_number, seg_keep) { _poller = EventPollerPool::Instance().getPoller(); _path_prefix = m3u8_file.substr(0, m3u8_file.rfind('/')); _path_hls = m3u8_file; diff --git a/src/Record/HlsMakerImp.h b/src/Record/HlsMakerImp.h index d23810e0..645302ba 100644 --- a/src/Record/HlsMakerImp.h +++ b/src/Record/HlsMakerImp.h @@ -26,7 +26,7 @@ public: uint32_t bufSize = 64 * 1024, float seg_duration = 5, uint32_t seg_number = 3, - uint32_t seg_keep = 0); + bool seg_keep = false); ~HlsMakerImp() override; diff --git a/src/Record/HlsRecorder.h b/src/Record/HlsRecorder.h index 91f5f6f7..0762a3e4 100644 --- a/src/Record/HlsRecorder.h +++ b/src/Record/HlsRecorder.h @@ -22,7 +22,7 @@ public: HlsRecorder(const std::string &m3u8_file, const std::string ¶ms) : MpegMuxer(false) { GET_CONFIG(uint32_t, hlsNum, Hls::kSegmentNum); - GET_CONFIG(uint32_t, hlsKeep, Hls::kSegmentKeep); + GET_CONFIG(bool, hlsKeep, Hls::kSegmentKeep); GET_CONFIG(uint32_t, hlsBufSize, Hls::kFileBufSize); GET_CONFIG(float, hlsDuration, Hls::kSegmentDuration); _hls = std::make_shared(m3u8_file, params, hlsBufSize, hlsDuration, hlsNum, hlsKeep);