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

Side by Side Diff: webrtc/audio/audio_state.h

Issue 2550273003: Moved call.h and most of api/call/* into call/ (Closed)
Patch Set: Added <set> include after presubmit complained. Created 4 years 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/audio/audio_send_stream.h ('k') | webrtc/call.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_AUDIO_AUDIO_STATE_H_ 11 #ifndef WEBRTC_AUDIO_AUDIO_STATE_H_
12 #define WEBRTC_AUDIO_AUDIO_STATE_H_ 12 #define WEBRTC_AUDIO_AUDIO_STATE_H_
13 13
14 #include "webrtc/api/call/audio_state.h"
15 #include "webrtc/audio/audio_transport_proxy.h" 14 #include "webrtc/audio/audio_transport_proxy.h"
16 #include "webrtc/audio/scoped_voe_interface.h" 15 #include "webrtc/audio/scoped_voe_interface.h"
17 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/call/audio_state.h"
20 #include "webrtc/voice_engine/include/voe_base.h" 20 #include "webrtc/voice_engine/include/voe_base.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 namespace internal { 23 namespace internal {
24 24
25 class AudioState final : public webrtc::AudioState, 25 class AudioState final : public webrtc::AudioState,
26 public webrtc::VoiceEngineObserver { 26 public webrtc::VoiceEngineObserver {
27 public: 27 public:
28 explicit AudioState(const AudioState::Config& config); 28 explicit AudioState(const AudioState::Config& config);
29 ~AudioState() override; 29 ~AudioState() override;
(...skipping 29 matching lines...) Expand all
59 // Transports mixed audio from the mixer to the audio device and 59 // Transports mixed audio from the mixer to the audio device and
60 // recorded audio to the VoE AudioTransport. 60 // recorded audio to the VoE AudioTransport.
61 AudioTransportProxy audio_transport_proxy_; 61 AudioTransportProxy audio_transport_proxy_;
62 62
63 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState); 63 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState);
64 }; 64 };
65 } // namespace internal 65 } // namespace internal
66 } // namespace webrtc 66 } // namespace webrtc
67 67
68 #endif // WEBRTC_AUDIO_AUDIO_STATE_H_ 68 #endif // WEBRTC_AUDIO_AUDIO_STATE_H_
OLDNEW
« no previous file with comments | « webrtc/audio/audio_send_stream.h ('k') | webrtc/call.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698