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

Side by Side Diff: webrtc/voice_engine/voe_base_impl.h

Issue 1830213002: Remove WVoE::SetAudioDeviceModule() - it is now set in ctor. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « webrtc/voice_engine/include/voe_base.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 15 matching lines...) Expand all
26 public AudioDeviceObserver { 26 public AudioDeviceObserver {
27 public: 27 public:
28 int RegisterVoiceEngineObserver(VoiceEngineObserver& observer) override; 28 int RegisterVoiceEngineObserver(VoiceEngineObserver& observer) override;
29 int DeRegisterVoiceEngineObserver() override; 29 int DeRegisterVoiceEngineObserver() override;
30 30
31 int Init(AudioDeviceModule* external_adm = nullptr, 31 int Init(AudioDeviceModule* external_adm = nullptr,
32 AudioProcessing* audioproc = nullptr) override; 32 AudioProcessing* audioproc = nullptr) override;
33 AudioProcessing* audio_processing() override { 33 AudioProcessing* audio_processing() override {
34 return shared_->audio_processing(); 34 return shared_->audio_processing();
35 } 35 }
36 AudioDeviceModule* audio_device_module() override {
37 return shared_->audio_device();
38 }
36 int Terminate() override; 39 int Terminate() override;
37 40
38 int CreateChannel() override; 41 int CreateChannel() override;
39 int CreateChannel(const Config& config) override; 42 int CreateChannel(const Config& config) override;
40 int DeleteChannel(int channel) override; 43 int DeleteChannel(int channel) override;
41 44
42 int StartReceive(int channel) override; 45 int StartReceive(int channel) override;
43 int StartPlayout(int channel) override; 46 int StartPlayout(int channel) override;
44 int StartSend(int channel) override; 47 int StartSend(int channel) override;
45 int StopReceive(int channel) override; 48 int StopReceive(int channel) override;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 VoiceEngineObserver* voiceEngineObserverPtr_; 144 VoiceEngineObserver* voiceEngineObserverPtr_;
142 rtc::CriticalSection callbackCritSect_; 145 rtc::CriticalSection callbackCritSect_;
143 146
144 AudioFrame audioFrame_; 147 AudioFrame audioFrame_;
145 voe::SharedData* shared_; 148 voe::SharedData* shared_;
146 }; 149 };
147 150
148 } // namespace webrtc 151 } // namespace webrtc
149 152
150 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H 153 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/include/voe_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698