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

Side by Side Diff: webrtc/sound/soundsystemproxy.h

Issue 1425533003: Fix chromium-style warnings in webrtc/sound/. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
« no previous file with comments | « webrtc/sound/soundoutputstreaminterface.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 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 #ifndef WEBRTC_SOUND_SOUNDSYSTEMPROXY_H_ 11 #ifndef WEBRTC_SOUND_SOUNDSYSTEMPROXY_H_
12 #define WEBRTC_SOUND_SOUNDSYSTEMPROXY_H_ 12 #define WEBRTC_SOUND_SOUNDSYSTEMPROXY_H_
13 13
14 #include "webrtc/sound/soundsysteminterface.h" 14 #include "webrtc/sound/soundsysteminterface.h"
15 #include "webrtc/base/basictypes.h" // for NULL 15 #include "webrtc/base/basictypes.h" // for NULL
16 16
17 namespace rtc { 17 namespace rtc {
18 18
19 // A SoundSystemProxy is a sound system that defers to another one. 19 // A SoundSystemProxy is a sound system that defers to another one.
20 // Init(), Terminate(), and GetName() are left as pure virtual, so a sub-class 20 // Init(), Terminate(), and GetName() are left as pure virtual, so a sub-class
21 // must define them. 21 // must define them.
22 class SoundSystemProxy : public SoundSystemInterface { 22 class SoundSystemProxy : public SoundSystemInterface {
23 public: 23 public:
24 SoundSystemProxy() : wrapped_(NULL) {} 24 SoundSystemProxy() : wrapped_(NULL) {}
25 25
26 // Each of these methods simply defers to wrapped_ if non-NULL, else fails. 26 // Each of these methods simply defers to wrapped_ if non-NULL, else fails.
27 27
28 virtual bool EnumeratePlaybackDevices(SoundDeviceLocatorList *devices); 28 bool EnumeratePlaybackDevices(SoundDeviceLocatorList *devices) override;
29 virtual bool EnumerateCaptureDevices(SoundDeviceLocatorList *devices); 29 bool EnumerateCaptureDevices(SoundDeviceLocatorList *devices) override;
30 30
31 virtual bool GetDefaultPlaybackDevice(SoundDeviceLocator **device); 31 bool GetDefaultPlaybackDevice(SoundDeviceLocator **device) override;
32 virtual bool GetDefaultCaptureDevice(SoundDeviceLocator **device); 32 bool GetDefaultCaptureDevice(SoundDeviceLocator **device) override;
33 33
34 virtual SoundOutputStreamInterface *OpenPlaybackDevice( 34 SoundOutputStreamInterface *OpenPlaybackDevice(
35 const SoundDeviceLocator *device, 35 const SoundDeviceLocator *device,
36 const OpenParams &params); 36 const OpenParams &params) override;
37 virtual SoundInputStreamInterface *OpenCaptureDevice( 37 SoundInputStreamInterface *OpenCaptureDevice(
38 const SoundDeviceLocator *device, 38 const SoundDeviceLocator *device,
39 const OpenParams &params); 39 const OpenParams &params) override;
40 40
41 protected: 41 protected:
42 SoundSystemInterface *wrapped_; 42 SoundSystemInterface *wrapped_;
43 }; 43 };
44 44
45 } // namespace rtc 45 } // namespace rtc
46 46
47 #endif // WEBRTC_SOUND_SOUNDSYSTEMPROXY_H_ 47 #endif // WEBRTC_SOUND_SOUNDSYSTEMPROXY_H_
OLDNEW
« no previous file with comments | « webrtc/sound/soundoutputstreaminterface.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698