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

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

Issue 2082483003: voice_engine: Removed old variants of Channel constructor and CreateChannel (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 4 years, 4 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/channel.cc ('k') | webrtc/voice_engine/channel_manager.cc » ('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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 private: 91 private:
92 size_t iterator_pos_; 92 size_t iterator_pos_;
93 std::vector<ChannelOwner> channels_; 93 std::vector<ChannelOwner> channels_;
94 94
95 RTC_DISALLOW_COPY_AND_ASSIGN(Iterator); 95 RTC_DISALLOW_COPY_AND_ASSIGN(Iterator);
96 }; 96 };
97 97
98 // CreateChannel will always return a valid ChannelOwner instance. The channel 98 // CreateChannel will always return a valid ChannelOwner instance. The channel
99 // is created either based on internal configuration, i.e. |config_|, by 99 // is created either based on internal configuration, i.e. |config_|, by
100 // calling CreateChannel(), or using and external configuration 100 // calling CreateChannel(...), or using and external configuration
101 // |external_config| if the overloaded method 101 // |external_config| if the overloaded method
102 // CreateChannel(const Config& external_config) is called. 102 // CreateChannel(const Config& external_config, ...) is called.
103 ChannelOwner CreateChannel();
104 ChannelOwner CreateChannel(const Config& external_config);
105 ChannelOwner CreateChannel( 103 ChannelOwner CreateChannel(
106 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory); 104 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
107 ChannelOwner CreateChannel( 105 ChannelOwner CreateChannel(
108 const Config& external_config, 106 const Config& external_config,
109 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory); 107 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
110 108
111 // ChannelOwner.channel() will be NULL if channel_id is invalid or no longer 109 // ChannelOwner.channel() will be NULL if channel_id is invalid or no longer
112 // exists. This should be checked with ChannelOwner::IsValid(). 110 // exists. This should be checked with ChannelOwner::IsValid().
113 ChannelOwner GetChannel(int32_t channel_id); 111 ChannelOwner GetChannel(int32_t channel_id);
114 void GetAllChannels(std::vector<ChannelOwner>* channels); 112 void GetAllChannels(std::vector<ChannelOwner>* channels);
(...skipping 17 matching lines...) Expand all
132 std::vector<ChannelOwner> channels_; 130 std::vector<ChannelOwner> channels_;
133 131
134 const Config& config_; 132 const Config& config_;
135 133
136 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager); 134 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
137 }; 135 };
138 } // namespace voe 136 } // namespace voe
139 } // namespace webrtc 137 } // namespace webrtc
140 138
141 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H 139 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698