diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-12 19:51:57 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-12 19:51:57 +0000 |
| commit | 52c5c708de6f5bcf9c2a58cece45013aa5efacd7 (patch) | |
| tree | c4334f3628c4a1dd2a216b6afb1285976f3760d4 /video_engine/vie_render_manager.h | |
| parent | 8c8c87fffe762f02d64aba9c786a37450927ebeb (diff) | |
| download | webrtc-52c5c708de6f5bcf9c2a58cece45013aa5efacd7.tar.gz | |
Replace MapWrapper with std::map<>.
MapWrapper was needed on some platforms where STL wasn't supported, we
now use std::map<> directly.
BUG=2164
TEST=trybots
R=henrike@webrtc.org, phoglund@webrtc.org, stefan@webrtc.org, wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2001004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4530 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_render_manager.h')
| -rw-r--r-- | video_engine/vie_render_manager.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/video_engine/vie_render_manager.h b/video_engine/vie_render_manager.h index 900fcdc7..bc32893a 100644 --- a/video_engine/vie_render_manager.h +++ b/video_engine/vie_render_manager.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_ #define WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_ +#include <map> + #include "webrtc/system_wrappers/interface/list_wrapper.h" -#include "webrtc/system_wrappers/interface/map_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" - #include "webrtc/video_engine/vie_manager_base.h" namespace webrtc { @@ -55,7 +55,10 @@ class ViERenderManager : private ViEManagerBase { scoped_ptr<CriticalSectionWrapper> list_cs_; int32_t engine_id_; - MapWrapper stream_to_vie_renderer_; // Protected by ViEManagerBase. + // Protected by ViEManagerBase. + typedef std::map<int32_t, ViERenderer*> RendererMap; + RendererMap stream_to_vie_renderer_; + ListWrapper render_list_; bool use_external_render_module_; }; |