Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-05 02:20:53 +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

5
player/SDLAudioDevice.h
View File

@@ -21,7 +21,6 @@
#define DEFAULT_CHANNEL 2
#define DEFAULT_SAMPLES 1024
using namespace std;
class AudioSRC;
@@ -43,8 +42,8 @@ private:
private:
std::shared_ptr<char> _play_buf;
SDL_AudioSpec _audio_config;
recursive_mutex _channel_mtx;
unordered_set<AudioSRC *> _channels;
std::recursive_mutex _channel_mtx;
std::unordered_set<AudioSRC *> _channels;
};
#endif /* SDLAUDIOMIXER_SDLAUDIODEVICE_H_ */