| 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 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 638 return 0; | 638 return 0; |
| 639 } | 639 } |
| 640 | 640 |
| 641 int TransmitMixer::StopPlayingFileAsMicrophone() | 641 int TransmitMixer::StopPlayingFileAsMicrophone() |
| 642 { | 642 { |
| 643 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1), | 643 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,-1), |
| 644 "TransmitMixer::StopPlayingFileAsMicrophone()"); | 644 "TransmitMixer::StopPlayingFileAsMicrophone()"); |
| 645 | 645 |
| 646 if (!_filePlaying) | 646 if (!_filePlaying) |
| 647 { | 647 { |
| 648 _engineStatisticsPtr->SetLastError( | |
| 649 VE_INVALID_OPERATION, kTraceWarning, | |
| 650 "StopPlayingFileAsMicrophone() isnot playing"); | |
| 651 return 0; | 648 return 0; |
| 652 } | 649 } |
| 653 | 650 |
| 654 CriticalSectionScoped cs(&_critSect); | 651 CriticalSectionScoped cs(&_critSect); |
| 655 | 652 |
| 656 if (_filePlayerPtr->StopPlayingFile() != 0) | 653 if (_filePlayerPtr->StopPlayingFile() != 0) |
| 657 { | 654 { |
| 658 _engineStatisticsPtr->SetLastError( | 655 _engineStatisticsPtr->SetLastError( |
| 659 VE_CANNOT_STOP_PLAYOUT, kTraceError, | 656 VE_CANNOT_STOP_PLAYOUT, kTraceError, |
| 660 "StopPlayingFile() couldnot stop playing file"); | 657 "StopPlayingFile() couldnot stop playing file"); |
| (...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1337 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { | 1334 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { |
| 1338 swap_stereo_channels_ = enable; | 1335 swap_stereo_channels_ = enable; |
| 1339 } | 1336 } |
| 1340 | 1337 |
| 1341 bool TransmitMixer::IsStereoChannelSwappingEnabled() { | 1338 bool TransmitMixer::IsStereoChannelSwappingEnabled() { |
| 1342 return swap_stereo_channels_; | 1339 return swap_stereo_channels_; |
| 1343 } | 1340 } |
| 1344 | 1341 |
| 1345 } // namespace voe | 1342 } // namespace voe |
| 1346 } // namespace webrtc | 1343 } // namespace webrtc |
| OLD | NEW |