Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Side by Side Diff: webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/interface/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
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 strncpy(&controlName[2], pos1, nChar); 1308 strncpy(&controlName[2], pos1, nChar);
1309 controlName[2 + nChar] = '\0'; 1309 controlName[2 + nChar] = '\0';
1310 } else 1310 } else
1311 { 1311 {
1312 strcpy(controlName, deviceName); 1312 strcpy(controlName, deviceName);
1313 } 1313 }
1314 1314
1315 } 1315 }
1316 1316
1317 } 1317 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698