Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1271)

Unified Diff: webrtc/voice_engine/voe_dtmf_impl.cc

Issue 1607353002: Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/voice_engine/voe_dtmf_impl.cc
diff --git a/webrtc/voice_engine/voe_dtmf_impl.cc b/webrtc/voice_engine/voe_dtmf_impl.cc
index cf6ab1dd7b58ef5924a0e3dc1d005b37b38f5e2d..5246cdd468378826cbc1db1a3c75407d799f93bc 100644
--- a/webrtc/voice_engine/voe_dtmf_impl.cc
+++ b/webrtc/voice_engine/voe_dtmf_impl.cc
@@ -10,7 +10,6 @@
#include "webrtc/voice_engine/voe_dtmf_impl.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/system_wrappers/include/trace.h"
#include "webrtc/voice_engine/channel.h"
#include "webrtc/voice_engine/include/voe_errors.h"
@@ -197,7 +196,7 @@ int VoEDtmfImpl::SetDtmfFeedbackStatus(bool enable, bool directFeedback) {
"SetDtmfFeedbackStatus(enable=%d, directFeeback=%d)",
(int)enable, (int)directFeedback);
- CriticalSectionScoped sc(_shared->crit_sec());
+ rtc::CritScope cs(_shared->crit_sec());
the sun 2016/01/21 13:07:28 nit: transitive dependency? Include-what-you-use?
tommi 2016/01/21 15:29:23 Done.
_dtmfFeedback = enable;
_dtmfDirectFeedback = directFeedback;
@@ -206,7 +205,7 @@ int VoEDtmfImpl::SetDtmfFeedbackStatus(bool enable, bool directFeedback) {
}
int VoEDtmfImpl::GetDtmfFeedbackStatus(bool& enabled, bool& directFeedback) {
- CriticalSectionScoped sc(_shared->crit_sec());
+ rtc::CritScope cs(_shared->crit_sec());
enabled = _dtmfFeedback;
directFeedback = _dtmfDirectFeedback;

Powered by Google App Engine
This is Rietveld 408576698