| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  109                             char guid[kAdmMaxGuidSize]) override; |  109                             char guid[kAdmMaxGuidSize]) override; | 
|  110   int32_t RecordingDeviceName(uint16_t index, |  110   int32_t RecordingDeviceName(uint16_t index, | 
|  111                               char name[kAdmMaxDeviceNameSize], |  111                               char name[kAdmMaxDeviceNameSize], | 
|  112                               char guid[kAdmMaxGuidSize]) override; |  112                               char guid[kAdmMaxGuidSize]) override; | 
|  113   int32_t SetPlayoutDevice(uint16_t index) override; |  113   int32_t SetPlayoutDevice(uint16_t index) override; | 
|  114   int32_t SetPlayoutDevice( |  114   int32_t SetPlayoutDevice( | 
|  115       AudioDeviceModule::WindowsDeviceType device) override; |  115       AudioDeviceModule::WindowsDeviceType device) override; | 
|  116   int32_t SetRecordingDevice(uint16_t index) override; |  116   int32_t SetRecordingDevice(uint16_t index) override; | 
|  117   int32_t SetRecordingDevice( |  117   int32_t SetRecordingDevice( | 
|  118       AudioDeviceModule::WindowsDeviceType device) override; |  118       AudioDeviceModule::WindowsDeviceType device) override; | 
|  119   int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) override; |  | 
|  120   int32_t WaveOutVolume(uint16_t& volumeLeft, |  | 
|  121                         uint16_t& volumeRight) const override; |  | 
|  122   int32_t InitSpeaker() override; |  119   int32_t InitSpeaker() override; | 
|  123   bool SpeakerIsInitialized() const override; |  120   bool SpeakerIsInitialized() const override; | 
|  124   int32_t InitMicrophone() override; |  121   int32_t InitMicrophone() override; | 
|  125   bool MicrophoneIsInitialized() const override; |  122   bool MicrophoneIsInitialized() const override; | 
|  126   int32_t SpeakerVolumeIsAvailable(bool& available) override; |  123   int32_t SpeakerVolumeIsAvailable(bool& available) override; | 
|  127   int32_t SetSpeakerVolume(uint32_t volume) override; |  124   int32_t SetSpeakerVolume(uint32_t volume) override; | 
|  128   int32_t SpeakerVolume(uint32_t& volume) const override; |  125   int32_t SpeakerVolume(uint32_t& volume) const override; | 
|  129   int32_t MaxSpeakerVolume(uint32_t& maxVolume) const override; |  126   int32_t MaxSpeakerVolume(uint32_t& maxVolume) const override; | 
|  130   int32_t MinSpeakerVolume(uint32_t& minVolume) const override; |  127   int32_t MinSpeakerVolume(uint32_t& minVolume) const override; | 
|  131   int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const override; |  128   int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const override; | 
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  312   // Contains the time for when the last output volume change was detected. |  309   // Contains the time for when the last output volume change was detected. | 
|  313   int64_t last_output_volume_change_time_ ACCESS_ON(thread_checker_); |  310   int64_t last_output_volume_change_time_ ACCESS_ON(thread_checker_); | 
|  314  |  311  | 
|  315   // Exposes private members for testing purposes only. |  312   // Exposes private members for testing purposes only. | 
|  316   FRIEND_TEST_ALL_PREFIXES(AudioDeviceTest, testInterruptedAudioSession); |  313   FRIEND_TEST_ALL_PREFIXES(AudioDeviceTest, testInterruptedAudioSession); | 
|  317 }; |  314 }; | 
|  318  |  315  | 
|  319 }  // namespace webrtc |  316 }  // namespace webrtc | 
|  320  |  317  | 
|  321 #endif  // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ |  318 #endif  // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ | 
| OLD | NEW |