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

解决合并冲突

Browse Source
This commit is contained in:
monktan
2020-11-24 14:49:21 +08:00
parent 6e8d19704e f7433b0f90
commit 8e575c0c78
11 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Record/Recorder.cpp
View File

@@ -78,7 +78,8 @@ std::shared_ptr<MediaSinkInterface> Recorder::createRecorder(type type, const st
switch (type) {
case Recorder::type_hls: {
#if defined(ENABLE_HLS)
auto ret = std::make_shared<HlsRecorder>(path, string(VHOST_KEY) + "=" + vhost, 0);
GET_CONFIG(bool, enable_vhost, General::kEnableVhost);
auto ret = std::make_shared<HlsRecorder>(path, enable_vhost ? string(VHOST_KEY) + "=" + vhost : "", 0);
InfoL << "create Hls Record ret "<<ret;
ret->setMediaSource(vhost, app, stream_id);
return ret;
@@ -95,7 +96,8 @@ std::shared_ptr<MediaSinkInterface> Recorder::createRecorder(type type, const st
case Recorder::type_hls_record: {
#if defined(ENABLE_HLS)
auto ret = std::make_shared<HlsRecorder>(path, string(VHOST_KEY) + "=" + vhost, 2);
GET_CONFIG(bool, enable_vhost, General::kEnableVhost);
auto ret = std::make_shared<HlsRecorder>(path, enable_vhost ? string(VHOST_KEY) + "=" + vhost : "", 2);
InfoL << "create Hls Record ret "<<ret;
ret->setMediaSource(vhost, app, stream_id);
return ret;