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

Side by Side Diff: webrtc/voice_engine/channel_proxy.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/pc/channelmanager.cc ('k') | webrtc/voice_engine/include/voe_base.h » ('j') | 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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
11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
12 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
13 13
14 #include "webrtc/base/constructormagic.h"
14 #include "webrtc/base/thread_checker.h" 15 #include "webrtc/base/thread_checker.h"
15 #include "webrtc/voice_engine/channel_manager.h" 16 #include "webrtc/voice_engine/channel_manager.h"
16 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 17 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
17 18
18 #include <memory> 19 #include <memory>
19 #include <string> 20 #include <string>
20 #include <vector> 21 #include <vector>
21 22
22 namespace webrtc { 23 namespace webrtc {
23 24
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 virtual bool SetSendTelephoneEventPayloadType(int payload_type); 71 virtual bool SetSendTelephoneEventPayloadType(int payload_type);
71 virtual bool SendTelephoneEventOutband(int event, int duration_ms); 72 virtual bool SendTelephoneEventOutband(int event, int duration_ms);
72 73
73 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink); 74 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink);
74 75
75 private: 76 private:
76 Channel* channel() const; 77 Channel* channel() const;
77 78
78 rtc::ThreadChecker thread_checker_; 79 rtc::ThreadChecker thread_checker_;
79 ChannelOwner channel_owner_; 80 ChannelOwner channel_owner_;
81
82 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
80 }; 83 };
81 } // namespace voe 84 } // namespace voe
82 } // namespace webrtc 85 } // namespace webrtc
83 86
84 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 87 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW
« no previous file with comments | « webrtc/pc/channelmanager.cc ('k') | webrtc/voice_engine/include/voe_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698