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

整理命名空间 (#1409)

Browse Source 
* feat: remove using namespace mediakit in header files.

(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)

* feat: remove using namespace mediakit in FFmpegSource.h

* feat: remove using namespace mediakit in RtpExt.h

* feat: remove using namespace mediakit in header files.

* feat: remove using namespace std in header files.

* feat: remove using namespace std in header files when zltoolkit remove std in header

* 补充命名空间

* 整理命名空间

* 整理命名空间2

* 修复macos ci

* 修复编译问题

* 修复编译问题2

* 修复编译问题3

Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
This commit is contained in:
夏楚
2022-02-02 20:34:50 +08:00
committed by GitHub
parent 80a0e27d8c
commit c72cf4cbcc
239 changed files with 1887 additions and 1766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
player/AudioSRC.h
View File

@@ -30,9 +30,6 @@ extern "C" {
#include "SDLAudioDevice.h"
#include "FFMpegDecoder.h"
using namespace std;
using namespace toolkit;
class AudioSRCDelegate {
public:
virtual ~AudioSRCDelegate() {};
@@ -58,7 +55,7 @@ private:
int _buf_size = 0;
std::shared_ptr<char> _buf;
AudioSRCDelegate *_delegate = nullptr;
BufferLikeString _target_buf;
toolkit::BufferLikeString _target_buf;
SDL_AudioCVT _audio_cvt;
};
@@ -79,8 +76,8 @@ private:
private:
int _sample_rate, _channel;
SDL_AudioFormat _format;
mutex _mtx;
BufferLikeString _buffer;
std::mutex _mtx;
toolkit::BufferLikeString _buffer;
SDLAudioDevice::Ptr _device;
};