| 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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 484     rtc::CritScope cs(&_critSect); | 484     rtc::CritScope cs(&_critSect); | 
| 485 | 485 | 
| 486     // Destroy the old instance | 486     // Destroy the old instance | 
| 487     if (file_player_) { | 487     if (file_player_) { | 
| 488       file_player_->RegisterModuleFileCallback(NULL); | 488       file_player_->RegisterModuleFileCallback(NULL); | 
| 489       file_player_.reset(); | 489       file_player_.reset(); | 
| 490     } | 490     } | 
| 491 | 491 | 
| 492     // Dynamically create the instance | 492     // Dynamically create the instance | 
| 493     file_player_ = | 493     file_player_ = | 
| 494         FilePlayer::NewFilePlayer(_filePlayerId, (const FileFormats)format); | 494         FilePlayer::CreateFilePlayer(_filePlayerId, (const FileFormats)format); | 
| 495 | 495 | 
| 496     if (!file_player_) { | 496     if (!file_player_) { | 
| 497       _engineStatisticsPtr->SetLastError( | 497       _engineStatisticsPtr->SetLastError( | 
| 498           VE_INVALID_ARGUMENT, kTraceError, | 498           VE_INVALID_ARGUMENT, kTraceError, | 
| 499           "StartPlayingFileAsMicrophone() filePlayer format isnot correct"); | 499           "StartPlayingFileAsMicrophone() filePlayer format isnot correct"); | 
| 500       return -1; | 500       return -1; | 
| 501     } | 501     } | 
| 502 | 502 | 
| 503     const uint32_t notificationTime(0); | 503     const uint32_t notificationTime(0); | 
| 504 | 504 | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 550     rtc::CritScope cs(&_critSect); | 550     rtc::CritScope cs(&_critSect); | 
| 551 | 551 | 
| 552     // Destroy the old instance | 552     // Destroy the old instance | 
| 553     if (file_player_) { | 553     if (file_player_) { | 
| 554       file_player_->RegisterModuleFileCallback(NULL); | 554       file_player_->RegisterModuleFileCallback(NULL); | 
| 555       file_player_.reset(); | 555       file_player_.reset(); | 
| 556     } | 556     } | 
| 557 | 557 | 
| 558     // Dynamically create the instance | 558     // Dynamically create the instance | 
| 559     file_player_ = | 559     file_player_ = | 
| 560         FilePlayer::NewFilePlayer(_filePlayerId, (const FileFormats)format); | 560         FilePlayer::CreateFilePlayer(_filePlayerId, (const FileFormats)format); | 
| 561 | 561 | 
| 562     if (!file_player_) { | 562     if (!file_player_) { | 
| 563       _engineStatisticsPtr->SetLastError( | 563       _engineStatisticsPtr->SetLastError( | 
| 564           VE_INVALID_ARGUMENT, kTraceWarning, | 564           VE_INVALID_ARGUMENT, kTraceWarning, | 
| 565           "StartPlayingFileAsMicrophone() filePlayer format isnot correct"); | 565           "StartPlayingFileAsMicrophone() filePlayer format isnot correct"); | 
| 566       return -1; | 566       return -1; | 
| 567     } | 567     } | 
| 568 | 568 | 
| 569     const uint32_t notificationTime(0); | 569     const uint32_t notificationTime(0); | 
| 570 | 570 | 
| (...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1228 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { | 1228 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { | 
| 1229   swap_stereo_channels_ = enable; | 1229   swap_stereo_channels_ = enable; | 
| 1230 } | 1230 } | 
| 1231 | 1231 | 
| 1232 bool TransmitMixer::IsStereoChannelSwappingEnabled() { | 1232 bool TransmitMixer::IsStereoChannelSwappingEnabled() { | 
| 1233   return swap_stereo_channels_; | 1233   return swap_stereo_channels_; | 
| 1234 } | 1234 } | 
| 1235 | 1235 | 
| 1236 }  // namespace voe | 1236 }  // namespace voe | 
| 1237 }  // namespace webrtc | 1237 }  // namespace webrtc | 
| OLD | NEW | 
|---|