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

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

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting fix. Created 5 years, 3 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/video_engine/vie_channel_group.cc ('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) 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 Channel* GetChannel(); 85 Channel* GetChannel();
86 bool IsValid(); 86 bool IsValid();
87 87
88 void Increment(); 88 void Increment();
89 89
90 private: 90 private:
91 size_t iterator_pos_; 91 size_t iterator_pos_;
92 std::vector<ChannelOwner> channels_; 92 std::vector<ChannelOwner> channels_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(Iterator); 94 RTC_DISALLOW_COPY_AND_ASSIGN(Iterator);
95 }; 95 };
96 96
97 // CreateChannel will always return a valid ChannelOwner instance. The channel 97 // CreateChannel will always return a valid ChannelOwner instance. The channel
98 // is created either based on internal configuration, i.e. |config_|, by 98 // is created either based on internal configuration, i.e. |config_|, by
99 // calling CreateChannel(), or using and external configuration 99 // calling CreateChannel(), or using and external configuration
100 // |external_config| if the overloaded method 100 // |external_config| if the overloaded method
101 // CreateChannel(const Config& external_config) is called. 101 // CreateChannel(const Config& external_config) is called.
102 ChannelOwner CreateChannel(); 102 ChannelOwner CreateChannel();
103 ChannelOwner CreateChannel(const Config& external_config); 103 ChannelOwner CreateChannel(const Config& external_config);
104 104
(...skipping 17 matching lines...) Expand all
122 uint32_t instance_id_; 122 uint32_t instance_id_;
123 123
124 Atomic32 last_channel_id_; 124 Atomic32 last_channel_id_;
125 125
126 rtc::scoped_ptr<CriticalSectionWrapper> lock_; 126 rtc::scoped_ptr<CriticalSectionWrapper> lock_;
127 std::vector<ChannelOwner> channels_; 127 std::vector<ChannelOwner> channels_;
128 128
129 const Config& config_; 129 const Config& config_;
130 rtc::scoped_ptr<RtcEventLog> event_log_; 130 rtc::scoped_ptr<RtcEventLog> event_log_;
131 131
132 DISALLOW_COPY_AND_ASSIGN(ChannelManager); 132 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
133 }; 133 };
134 } // namespace voe 134 } // namespace voe
135 } // namespace webrtc 135 } // namespace webrtc
136 136
137 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H 137 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_channel_group.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698