| 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 <assert.h> | 11 #include <assert.h> |
| 12 | 12 |
| 13 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" | 13 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" |
| 14 #include "webrtc/system_wrappers/include/trace.h" | 14 #include "webrtc/system_wrappers/include/trace.h" |
| 15 | 15 |
| 16 extern webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; | 16 extern webrtc::adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; |
| 17 | 17 |
| 18 // Accesses ALSA functions through our late-binding symbol table instead of | 18 // Accesses ALSA functions through our late-binding symbol table instead of |
| 19 // directly. This way we don't have to link to libalsa, which means our binary | 19 // directly. This way we don't have to link to libalsa, which means our binary |
| 20 // will work on systems that don't have it. | 20 // will work on systems that don't have it. |
| 21 #define LATE(sym) \ | 21 #define LATE(sym) \ |
| 22 LATESYM_GET(webrtc_adm_linux_alsa::AlsaSymbolTable, &AlsaSymbolTable, sym) | 22 LATESYM_GET(webrtc::adm_linux_alsa::AlsaSymbolTable, &AlsaSymbolTable, sym) |
| 23 | 23 |
| 24 namespace webrtc | 24 namespace webrtc |
| 25 { | 25 { |
| 26 | 26 |
| 27 AudioMixerManagerLinuxALSA::AudioMixerManagerLinuxALSA(const int32_t id) : | 27 AudioMixerManagerLinuxALSA::AudioMixerManagerLinuxALSA(const int32_t id) : |
| 28 _id(id), | 28 _id(id), |
| 29 _outputMixerHandle(NULL), | 29 _outputMixerHandle(NULL), |
| 30 _inputMixerHandle(NULL), | 30 _inputMixerHandle(NULL), |
| 31 _outputMixerElement(NULL), | 31 _outputMixerElement(NULL), |
| 32 _inputMixerElement(NULL) | 32 _inputMixerElement(NULL) |
| (...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1301 int nChar = (int) (pos2 - pos1); | 1301 int nChar = (int) (pos2 - pos1); |
| 1302 strncpy(&controlName[2], pos1, nChar); | 1302 strncpy(&controlName[2], pos1, nChar); |
| 1303 controlName[2 + nChar] = '\0'; | 1303 controlName[2 + nChar] = '\0'; |
| 1304 } else { | 1304 } else { |
| 1305 strcpy(controlName, deviceName); | 1305 strcpy(controlName, deviceName); |
| 1306 } | 1306 } |
| 1307 | 1307 |
| 1308 } | 1308 } |
| 1309 | 1309 |
| 1310 } | 1310 } |
| OLD | NEW |