| 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..c8cc52cce7280c5b6afa9161972453e4c64f4e9b 100644
|
| --- a/webrtc/voice_engine/voe_dtmf_impl.cc
|
| +++ b/webrtc/voice_engine/voe_dtmf_impl.cc
|
| @@ -10,7 +10,7 @@
|
|
|
| #include "webrtc/voice_engine/voe_dtmf_impl.h"
|
|
|
| -#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
|
| +#include "webrtc/base/criticalsection.h"
|
| #include "webrtc/system_wrappers/include/trace.h"
|
| #include "webrtc/voice_engine/channel.h"
|
| #include "webrtc/voice_engine/include/voe_errors.h"
|
| @@ -197,7 +197,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());
|
|
|
| _dtmfFeedback = enable;
|
| _dtmfDirectFeedback = directFeedback;
|
| @@ -206,7 +206,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;
|
|
|