From 0aa28b284823d74e6a3a3c01bfff1e43b58cd0e1 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Fri, 18 Oct 2019 10:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdpart/ZLToolKit               | 2 +-
 server/FFmpegSource.cpp         | 2 +-
 src/Http/HttpSession.cpp        | 2 +-
 src/MediaFile/MediaReader.cpp   | 2 +-
 src/MediaFile/MediaRecorder.cpp | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit
index ace77b13..1f99a167 160000
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@@ -1 +1 @@
-Subproject commit ace77b132039d6ef8a97b6dad92115f88821bc45
+Subproject commit 1f99a1679dd9136edc3e3b64edcc2c74ad7bd259
diff --git a/server/FFmpegSource.cpp b/server/FFmpegSource.cpp
index 8d348453..e55e6dbb 100644
--- a/server/FFmpegSource.cpp
+++ b/server/FFmpegSource.cpp
@@ -64,7 +64,7 @@ void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_
 
     char cmd[1024] = {0};
     snprintf(cmd, sizeof(cmd),ffmpeg_cmd.data(),ffmpeg_bin.data(),src_url.data(),dst_url.data());
-    _process.run(cmd,File::absolutePath("",false,ffmpeg_log));
+    _process.run(cmd,File::absolutePath("",ffmpeg_log));
     InfoL << cmd;
 
     if(_media_info._host == "127.0.0.1"){
diff --git a/src/Http/HttpSession.cpp b/src/Http/HttpSession.cpp
index b794c731..32765c84 100644
--- a/src/Http/HttpSession.cpp
+++ b/src/Http/HttpSession.cpp
@@ -504,7 +504,7 @@ void HttpSession::Handle_Req_GET(int64_t &content_len) {
     GET_CONFIG(uint32_t,reqCnt,Http::kMaxReqCount);
     GET_CONFIG(bool,enableVhost,General::kEnableVhost);
     GET_CONFIG(string,rootPath,Http::kRootPath);
-    auto strFile = File::absolutePath(enableVhost ? _mediaInfo._vhost + _parser.Url() : _parser.Url(), false, rootPath);
+    auto strFile = File::absolutePath(enableVhost ? _mediaInfo._vhost + _parser.Url() : _parser.Url(),rootPath);
     bool bClose = (strcasecmp(_parser["Connection"].data(),"close") == 0) || ( ++_iReqCnt > reqCnt);
 
     do{
diff --git a/src/MediaFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp
index 09d18659..eae430bd 100644
--- a/src/MediaFile/MediaReader.cpp
+++ b/src/MediaFile/MediaReader.cpp
@@ -48,7 +48,7 @@ MediaReader::MediaReader(const string &strVhost,const string &strApp, const stri
         }else{
             strFileName = strApp + "/" + strId;
         }
-		strFileName = File::absolutePath(strFileName, false,recordPath);
+		strFileName = File::absolutePath(strFileName,recordPath);
     }
 
 	_hMP4File = MP4Read(strFileName.data());
diff --git a/src/MediaFile/MediaRecorder.cpp b/src/MediaFile/MediaRecorder.cpp
index 6ec9ae41..e422b6e5 100644
--- a/src/MediaFile/MediaRecorder.cpp
+++ b/src/MediaFile/MediaRecorder.cpp
@@ -63,7 +63,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp,
         }else{
             m3u8FilePath = strApp + "/" + strId + "/hls.m3u8";
         }
-        m3u8FilePath = File::absolutePath(m3u8FilePath,false,hlsPath);
+        m3u8FilePath = File::absolutePath(m3u8FilePath,hlsPath);
         _hlsRecorder.reset(new HlsRecorder(m3u8FilePath,params,hlsBufSize, hlsDuration, hlsNum));
     }
 #endif //defined(ENABLE_HLS)
@@ -79,7 +79,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp,
         } else {
             mp4FilePath = recordAppName + "/" + strApp + "/"  + strId + "/";
         }
-        mp4FilePath = File::absolutePath(mp4FilePath,false,recordPath);
+        mp4FilePath = File::absolutePath(mp4FilePath,recordPath);
         _mp4Recorder.reset(new MP4Recorder(mp4FilePath,strVhost,strApp,strId));
     }
 #endif //defined(ENABLE_MP4RECORD)