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 |
11 #include "webrtc/voice_engine/voe_volume_control_impl.h" | 11 #include "webrtc/voice_engine/voe_volume_control_impl.h" |
12 | 12 |
13 #include "webrtc/system_wrappers/include/trace.h" | 13 #include "webrtc/system_wrappers/include/trace.h" |
14 #include "webrtc/voice_engine/channel.h" | 14 #include "webrtc/voice_engine/channel.h" |
15 #include "webrtc/voice_engine/include/voe_errors.h" | 15 #include "webrtc/voice_engine/include/voe_errors.h" |
16 #include "webrtc/voice_engine/output_mixer.h" | 16 #include "webrtc/voice_engine/output_mixer.h" |
17 #include "webrtc/voice_engine/transmit_mixer.h" | 17 #include "webrtc/voice_engine/transmit_mixer.h" |
18 #include "webrtc/voice_engine/voice_engine_impl.h" | 18 #include "webrtc/voice_engine/voice_engine_impl.h" |
19 | 19 |
20 #ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API | |
21 #error "Deprecated" | |
22 #endif | |
23 | |
24 namespace webrtc { | 20 namespace webrtc { |
25 | 21 |
26 VoEVolumeControl* VoEVolumeControl::GetInterface(VoiceEngine* voiceEngine) { | 22 VoEVolumeControl* VoEVolumeControl::GetInterface(VoiceEngine* voiceEngine) { |
27 #ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API | |
28 return NULL; | |
29 #else | |
30 if (NULL == voiceEngine) { | 23 if (NULL == voiceEngine) { |
31 return NULL; | 24 return NULL; |
32 } | 25 } |
33 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); | 26 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); |
34 s->AddRef(); | 27 s->AddRef(); |
35 return s; | 28 return s; |
36 #endif | |
37 } | 29 } |
38 | 30 |
39 #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API | |
40 | |
41 VoEVolumeControlImpl::VoEVolumeControlImpl(voe::SharedData* shared) | 31 VoEVolumeControlImpl::VoEVolumeControlImpl(voe::SharedData* shared) |
42 : _shared(shared) { | 32 : _shared(shared) { |
43 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), | 33 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), |
44 "VoEVolumeControlImpl::VoEVolumeControlImpl() - ctor"); | 34 "VoEVolumeControlImpl::VoEVolumeControlImpl() - ctor"); |
45 } | 35 } |
46 | 36 |
47 VoEVolumeControlImpl::~VoEVolumeControlImpl() { | 37 VoEVolumeControlImpl::~VoEVolumeControlImpl() { |
48 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), | 38 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), |
49 "VoEVolumeControlImpl::~VoEVolumeControlImpl() - dtor"); | 39 "VoEVolumeControlImpl::~VoEVolumeControlImpl() - dtor"); |
50 } | 40 } |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); | 401 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); |
412 voe::Channel* channelPtr = ch.channel(); | 402 voe::Channel* channelPtr = ch.channel(); |
413 if (channelPtr == NULL) { | 403 if (channelPtr == NULL) { |
414 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 404 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
415 "GetOutputVolumePan() failed to locate channel"); | 405 "GetOutputVolumePan() failed to locate channel"); |
416 return -1; | 406 return -1; |
417 } | 407 } |
418 return channelPtr->GetOutputVolumePan(left, right); | 408 return channelPtr->GetOutputVolumePan(left, right); |
419 } | 409 } |
420 | 410 |
421 #endif // #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API | |
422 | |
423 } // namespace webrtc | 411 } // namespace webrtc |
OLD | NEW |