| OLD | NEW | 
|---|
| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 64  const uint32_t _instanceId; | 64  const uint32_t _instanceId; | 
| 65  rtc::CriticalSection _apiCritPtr; | 65  rtc::CriticalSection _apiCritPtr; | 
| 66  ChannelManager _channelManager; | 66  ChannelManager _channelManager; | 
| 67  Statistics _engineStatistics; | 67  Statistics _engineStatistics; | 
| 68  rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr; | 68  rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr; | 
| 69  OutputMixer* _outputMixerPtr; | 69  OutputMixer* _outputMixerPtr; | 
| 70  TransmitMixer* _transmitMixerPtr; | 70  TransmitMixer* _transmitMixerPtr; | 
| 71  std::unique_ptr<ProcessThread> _moduleProcessThreadPtr; | 71  std::unique_ptr<ProcessThread> _moduleProcessThreadPtr; | 
| 72  // |encoder_queue| is defined last to ensure all pending tasks are cancelled | 72  // |encoder_queue| is defined last to ensure all pending tasks are cancelled | 
| 73  // and deleted before any other members. | 73  // and deleted before any other members. | 
| 74  rtc::TaskQueue encoder_queue_ ACCESS_ON(construction_thread_); | 74  rtc::TaskQueue encoder_queue_ RTC_ACCESS_ON(construction_thread_); | 
| 75 | 75 | 
| 76  SharedData(); | 76  SharedData(); | 
| 77  virtual ~SharedData(); | 77  virtual ~SharedData(); | 
| 78 }; | 78 }; | 
| 79 | 79 | 
| 80 }  // namespace voe | 80 }  // namespace voe | 
| 81 }  // namespace webrtc | 81 }  // namespace webrtc | 
| 82 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H | 82 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H | 
| OLD | NEW | 
|---|