| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 voe::Channel* channelPtr = ch.channel(); | 117 voe::Channel* channelPtr = ch.channel(); |
| 118 if (channelPtr == NULL) { | 118 if (channelPtr == NULL) { |
| 119 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 119 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 120 "StopPlayingFileLocally() failed to locate channel"); | 120 "StopPlayingFileLocally() failed to locate channel"); |
| 121 return -1; | 121 return -1; |
| 122 } | 122 } |
| 123 return channelPtr->StopPlayingFileLocally(); | 123 return channelPtr->StopPlayingFileLocally(); |
| 124 } | 124 } |
| 125 | 125 |
| 126 int VoEFileImpl::IsPlayingFileLocally(int channel) { | 126 int VoEFileImpl::IsPlayingFileLocally(int channel) { |
| 127 WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), | |
| 128 "IsPlayingFileLocally(channel=%d)", channel); | |
| 129 if (!_shared->statistics().Initialized()) { | 127 if (!_shared->statistics().Initialized()) { |
| 130 _shared->SetLastError(VE_NOT_INITED, kTraceError); | 128 _shared->SetLastError(VE_NOT_INITED, kTraceError); |
| 131 return -1; | 129 return -1; |
| 132 } | 130 } |
| 133 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); | 131 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); |
| 134 voe::Channel* channelPtr = ch.channel(); | 132 voe::Channel* channelPtr = ch.channel(); |
| 135 if (channelPtr == NULL) { | 133 if (channelPtr == NULL) { |
| 136 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 134 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 137 "StopPlayingFileLocally() failed to locate channel"); | 135 "StopPlayingFileLocally() failed to locate channel"); |
| 138 return -1; | 136 return -1; |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 "StopRecordingMicrophone() failed to stop recording to mixer"); | 467 "StopRecordingMicrophone() failed to stop recording to mixer"); |
| 470 err = -1; | 468 err = -1; |
| 471 } | 469 } |
| 472 | 470 |
| 473 return err; | 471 return err; |
| 474 } | 472 } |
| 475 | 473 |
| 476 #endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API | 474 #endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API |
| 477 | 475 |
| 478 } // namespace webrtc | 476 } // namespace webrtc |
| OLD | NEW |