diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-01-13 15:21:30 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-01-13 15:21:30 +0000 |
| commit | 083049f2945b2924203b25c8428300d40d994f35 (patch) | |
| tree | 38f58457df52fa04674df865ca112c8c4632594b /video_engine/vie_render_manager.h | |
| parent | ad584b66a1dd9a7983f6dce047beb5a539a8ca17 (diff) | |
| download | webrtc-083049f2945b2924203b25c8428300d40d994f35.tar.gz | |
Removes usage of ListWrapper from several files.
BUG=2164
R=andrew@webrtc.org, pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/6269004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5373 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_render_manager.h')
| -rw-r--r-- | video_engine/vie_render_manager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video_engine/vie_render_manager.h b/video_engine/vie_render_manager.h index bc32893a..c1314cde 100644 --- a/video_engine/vie_render_manager.h +++ b/video_engine/vie_render_manager.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_ #define WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_ +#include <list> #include <map> -#include "webrtc/system_wrappers/interface/list_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" #include "webrtc/video_engine/vie_manager_base.h" @@ -46,6 +46,7 @@ class ViERenderManager : private ViEManagerBase { int32_t RemoveRenderStream(int32_t render_id); private: + typedef std::list<VideoRender*> RenderList; // Returns a pointer to the render module if it exists in the render list. // Assumed protected. VideoRender* FindRenderModule(void* window); @@ -58,8 +59,7 @@ class ViERenderManager : private ViEManagerBase { // Protected by ViEManagerBase. typedef std::map<int32_t, ViERenderer*> RendererMap; RendererMap stream_to_vie_renderer_; - - ListWrapper render_list_; + RenderList render_list_; bool use_external_render_module_; }; |