diff options
author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-04-09 10:09:10 +0000 |
---|---|---|
committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-04-09 10:09:10 +0000 |
commit | 54f03bc96c30337a3a97af7262cfb5148063b162 (patch) | |
tree | 7ea8ea88941b30b55449b7e64f06383cb9f67611 /voice_engine/shared_data.cc | |
parent | c0231afbbf1d7bac40b77da5933715dc63c88144 (diff) | |
download | webrtc-54f03bc96c30337a3a97af7262cfb5148063b162.tar.gz |
WebRtc_Word32 -> int32_t in voice_engine/
BUG=314
Review URL: https://webrtc-codereview.appspot.com/1305004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3792 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/shared_data.cc')
-rw-r--r-- | voice_engine/shared_data.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/voice_engine/shared_data.cc b/voice_engine/shared_data.cc index 69ac8570..1393eb33 100644 --- a/voice_engine/shared_data.cc +++ b/voice_engine/shared_data.cc @@ -21,7 +21,7 @@ namespace webrtc { namespace voe { -static WebRtc_Word32 _gInstanceCounter = 0; +static int32_t _gInstanceCounter = 0; SharedData::SharedData() : _instanceId(++_gInstanceCounter), @@ -76,16 +76,16 @@ void SharedData::set_audio_processing(AudioProcessing* audioproc) { _outputMixerPtr->SetAudioProcessingModule(audioproc); } -WebRtc_UWord16 SharedData::NumOfSendingChannels() +uint16_t SharedData::NumOfSendingChannels() { - WebRtc_Word32 numOfChannels = _channelManager.NumOfChannels(); + int32_t numOfChannels = _channelManager.NumOfChannels(); if (numOfChannels <= 0) { return 0; } - WebRtc_UWord16 nChannelsSending(0); - WebRtc_Word32* channelsArray = new WebRtc_Word32[numOfChannels]; + uint16_t nChannelsSending(0); + int32_t* channelsArray = new int32_t[numOfChannels]; _channelManager.GetChannelIds(channelsArray, numOfChannels); for (int i = 0; i < numOfChannels; i++) @@ -104,16 +104,16 @@ WebRtc_UWord16 SharedData::NumOfSendingChannels() return nChannelsSending; } -void SharedData::SetLastError(const WebRtc_Word32 error) const { +void SharedData::SetLastError(const int32_t error) const { _engineStatistics.SetLastError(error); } -void SharedData::SetLastError(const WebRtc_Word32 error, +void SharedData::SetLastError(const int32_t error, const TraceLevel level) const { _engineStatistics.SetLastError(error, level); } -void SharedData::SetLastError(const WebRtc_Word32 error, const TraceLevel level, +void SharedData::SetLastError(const int32_t error, const TraceLevel level, const char* msg) const { _engineStatistics.SetLastError(error, level, msg); } |