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

Side by Side Diff: webrtc/sound/alsasoundsystem.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 | « no previous file | webrtc/sound/alsasoundsystem.cc » ('j') | 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
(...skipping 16 matching lines...) Expand all
27 friend class AlsaStream; 27 friend class AlsaStream;
28 friend class AlsaInputStream; 28 friend class AlsaInputStream;
29 friend class AlsaOutputStream; 29 friend class AlsaOutputStream;
30 public: 30 public:
31 static SoundSystemInterface *Create() { 31 static SoundSystemInterface *Create() {
32 return new AlsaSoundSystem(); 32 return new AlsaSoundSystem();
33 } 33 }
34 34
35 AlsaSoundSystem(); 35 AlsaSoundSystem();
36 36
37 virtual ~AlsaSoundSystem(); 37 ~AlsaSoundSystem() override;
38 38
39 virtual bool Init(); 39 bool Init() override;
40 virtual void Terminate(); 40 void Terminate() override;
41 41
42 virtual bool EnumeratePlaybackDevices(SoundDeviceLocatorList *devices); 42 bool EnumeratePlaybackDevices(SoundDeviceLocatorList *devices) override;
43 virtual bool EnumerateCaptureDevices(SoundDeviceLocatorList *devices); 43 bool EnumerateCaptureDevices(SoundDeviceLocatorList *devices) override;
44 44
45 virtual bool GetDefaultPlaybackDevice(SoundDeviceLocator **device); 45 bool GetDefaultPlaybackDevice(SoundDeviceLocator **device) override;
46 virtual bool GetDefaultCaptureDevice(SoundDeviceLocator **device); 46 bool GetDefaultCaptureDevice(SoundDeviceLocator **device) override;
47 47
48 virtual SoundOutputStreamInterface *OpenPlaybackDevice( 48 SoundOutputStreamInterface *OpenPlaybackDevice(
49 const SoundDeviceLocator *device, 49 const SoundDeviceLocator *device,
50 const OpenParams &params); 50 const OpenParams &params) override;
51 virtual SoundInputStreamInterface *OpenCaptureDevice( 51 SoundInputStreamInterface *OpenCaptureDevice(
52 const SoundDeviceLocator *device, 52 const SoundDeviceLocator *device,
53 const OpenParams &params); 53 const OpenParams &params) override;
54 54
55 virtual const char *GetName() const; 55 const char *GetName() const override;
56 56
57 private: 57 private:
58 bool IsInitialized() { return initialized_; } 58 bool IsInitialized() { return initialized_; }
59 59
60 bool EnumerateDevices(SoundDeviceLocatorList *devices, 60 bool EnumerateDevices(SoundDeviceLocatorList *devices,
61 bool capture_not_playback); 61 bool capture_not_playback);
62 62
63 bool GetDefaultDevice(SoundDeviceLocator **device); 63 bool GetDefaultDevice(SoundDeviceLocator **device);
64 64
65 static size_t FrameSize(const OpenParams &params); 65 static size_t FrameSize(const OpenParams &params);
(...skipping 28 matching lines...) Expand all
94 94
95 bool initialized_; 95 bool initialized_;
96 AlsaSymbolTable symbol_table_; 96 AlsaSymbolTable symbol_table_;
97 97
98 RTC_DISALLOW_COPY_AND_ASSIGN(AlsaSoundSystem); 98 RTC_DISALLOW_COPY_AND_ASSIGN(AlsaSoundSystem);
99 }; 99 };
100 100
101 } // namespace rtc 101 } // namespace rtc
102 102
103 #endif // WEBRTC_SOUND_ALSASOUNDSYSTEM_H_ 103 #endif // WEBRTC_SOUND_ALSASOUNDSYSTEM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/sound/alsasoundsystem.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698