diff options
author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-04-09 13:41:51 +0000 |
---|---|---|
committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-04-09 13:41:51 +0000 |
commit | 67879bc2e69d7907b7ceb92135a34f77fe643e7f (patch) | |
tree | 358714027896d78b274ee02da9dc6f188af4028d /video_engine/vie_render_manager.h | |
parent | c57ef84a298c25d213c1a0e262253a6a91d2b685 (diff) | |
download | webrtc-67879bc2e69d7907b7ceb92135a34f77fe643e7f.tar.gz |
WebRtc_Word32 -> int32_t in video_engine/
BUG=314
Review URL: https://webrtc-codereview.appspot.com/1302005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3801 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_render_manager.h')
-rw-r--r-- | video_engine/vie_render_manager.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/video_engine/vie_render_manager.h b/video_engine/vie_render_manager.h index ebdf8624..2e31222e 100644 --- a/video_engine/vie_render_manager.h +++ b/video_engine/vie_render_manager.h @@ -29,21 +29,21 @@ class ViERenderer; class ViERenderManager : private ViEManagerBase { friend class ViERenderManagerScoped; public: - explicit ViERenderManager(WebRtc_Word32 engine_id); + explicit ViERenderManager(int32_t engine_id); ~ViERenderManager(); - WebRtc_Word32 RegisterVideoRenderModule(VideoRender* render_module); - WebRtc_Word32 DeRegisterVideoRenderModule(VideoRender* render_module); + int32_t RegisterVideoRenderModule(VideoRender* render_module); + int32_t DeRegisterVideoRenderModule(VideoRender* render_module); - ViERenderer* AddRenderStream(const WebRtc_Word32 render_id, + ViERenderer* AddRenderStream(const int32_t render_id, void* window, - const WebRtc_UWord32 z_order, + const uint32_t z_order, const float left, const float top, const float right, const float bottom); - WebRtc_Word32 RemoveRenderStream(WebRtc_Word32 render_id); + int32_t RemoveRenderStream(int32_t render_id); private: // Returns a pointer to the render module if it exists in the render list. @@ -51,10 +51,10 @@ class ViERenderManager : private ViEManagerBase { VideoRender* FindRenderModule(void* window); // Methods used by ViERenderScoped. - ViERenderer* ViERenderPtr(WebRtc_Word32 render_id) const; + ViERenderer* ViERenderPtr(int32_t render_id) const; scoped_ptr<CriticalSectionWrapper> list_cs_; - WebRtc_Word32 engine_id_; + int32_t engine_id_; MapWrapper stream_to_vie_renderer_; // Protected by ViEManagerBase. ListWrapper render_list_; bool use_external_render_module_; @@ -65,7 +65,7 @@ class ViERenderManagerScoped: private ViEManagerScopedBase { explicit ViERenderManagerScoped(const ViERenderManager& vie_render_manager); // Returns a pointer to the ViERender object. - ViERenderer* Renderer(WebRtc_Word32 render_id) const; + ViERenderer* Renderer(int32_t render_id) const; }; } // namespace webrtc |