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

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

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 months 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/base/logging.h"
13 #include "webrtc/modules/audio_device/audio_device_config.h" 14 #include "webrtc/modules/audio_device/audio_device_config.h"
14 #include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h" 15 #include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h"
15 #include "webrtc/rtc_base/logging.h"
16 16
17 #include "webrtc/system_wrappers/include/event_wrapper.h" 17 #include "webrtc/system_wrappers/include/event_wrapper.h"
18 #include "webrtc/system_wrappers/include/sleep.h" 18 #include "webrtc/system_wrappers/include/sleep.h"
19 #include "webrtc/system_wrappers/include/trace.h" 19 #include "webrtc/system_wrappers/include/trace.h"
20 20
21 webrtc::adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; 21 webrtc::adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;
22 22
23 // Accesses ALSA functions through our late-binding symbol table instead of 23 // Accesses ALSA functions through our late-binding symbol table instead of
24 // directly. This way we don't have to link to libasound, which means our binary 24 // directly. This way we don't have to link to libasound, which means our binary
25 // will work on systems that don't have it. 25 // will work on systems that don't have it.
(...skipping 2184 matching lines...) Expand 10 before | Expand all | Expand 10 after
2210 state |= (szKey[i] ^ _oldKeyState[i]) & szKey[i]; 2210 state |= (szKey[i] ^ _oldKeyState[i]) & szKey[i];
2211 2211
2212 // Save old state 2212 // Save old state
2213 memcpy((char*)_oldKeyState, (char*)szKey, sizeof(_oldKeyState)); 2213 memcpy((char*)_oldKeyState, (char*)szKey, sizeof(_oldKeyState));
2214 return (state != 0); 2214 return (state != 0);
2215 #else 2215 #else
2216 return false; 2216 return false;
2217 #endif 2217 #endif
2218 } 2218 }
2219 } // namespace webrtc 2219 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698