diff options
| author | henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-17 10:45:01 +0000 |
|---|---|---|
| committer | henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-17 10:45:01 +0000 |
| commit | 692224a58367e945336c7fd62376fcfa54497437 (patch) | |
| tree | a09b54ed118a49e5659a95fbb0cb0107715c27cc /voice_engine/channel.h | |
| parent | 66ccaffbf91ffd265380c16e23eed4bcc2d1b505 (diff) | |
| download | webrtc-692224a58367e945336c7fd62376fcfa54497437.tar.gz | |
Removes parts of the VoEBase sub API as part of a clean-up operation where the goal is to remove unused APIs.
BUG=3206
R=henrik.lundin@webrtc.org, juberti@webrtc.org, niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12019005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5928 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/channel.h')
| -rw-r--r-- | voice_engine/channel.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/voice_engine/channel.h b/voice_engine/channel.h index 5d94a753..3377be0e 100644 --- a/voice_engine/channel.h +++ b/voice_engine/channel.h @@ -74,7 +74,6 @@ class ChannelState { struct State { State() : rx_apm_is_enabled(false), input_external_media(false), - output_is_on_hold(false), output_file_playing(false), input_file_playing(false), playing(false), @@ -83,7 +82,6 @@ class ChannelState { bool rx_apm_is_enabled; bool input_external_media; - bool output_is_on_hold; bool output_file_playing; bool input_file_playing; bool playing; @@ -115,11 +113,6 @@ class ChannelState { state_.input_external_media = enable; } - void SetOutputIsOnHold(bool enable) { - CriticalSectionScoped lock(lock_.get()); - state_.output_is_on_hold = enable; - } - void SetOutputFilePlaying(bool enable) { CriticalSectionScoped lock(lock_.get()); state_.output_file_playing = enable; @@ -193,8 +186,6 @@ public: int32_t SetNetEQPlayoutMode(NetEqModes mode); int32_t GetNetEQPlayoutMode(NetEqModes& mode); - int32_t SetOnHoldStatus(bool enable, OnHoldModes mode); - int32_t GetOnHoldStatus(bool& enabled, OnHoldModes& mode); int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer); int32_t DeRegisterVoiceEngineObserver(); @@ -466,10 +457,6 @@ public: { return _externalMixing; } - bool InputIsOnHold() const - { - return _inputIsOnHold; - } RtpRtcp* RtpRtcpModulePtr() const { return _rtpRtcpModule.get(); @@ -578,7 +565,6 @@ private: // VoEBase bool _externalPlayout; bool _externalMixing; - bool _inputIsOnHold; bool _mixFileWithMicrophone; bool _rtpObserver; bool _rtcpObserver; |