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

Unified Diff: media/audio/cras/audio_manager_cras.h

Issue 967693002: Clang fixes for chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: media/audio/cras/audio_manager_cras.h
diff --git a/media/audio/cras/audio_manager_cras.h b/media/audio/cras/audio_manager_cras.h
index 0bceb456ea5caf0f0ab8542c268768dbe79713dc..4c8f992ee05a61dc041a49f9a37a6df846986e6d 100644
--- a/media/audio/cras/audio_manager_cras.h
+++ b/media/audio/cras/audio_manager_cras.h
@@ -20,34 +20,34 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase {
AudioManagerCras(AudioLogFactory* audio_log_factory);
// AudioManager implementation.
- virtual bool HasAudioOutputDevices() override;
- virtual bool HasAudioInputDevices() override;
- virtual void ShowAudioInputSettings() override;
- virtual void GetAudioInputDeviceNames(
- AudioDeviceNames* device_names) override;
- virtual void GetAudioOutputDeviceNames(
- AudioDeviceNames* device_names) override;
- virtual AudioParameters GetInputStreamParameters(
+ bool HasAudioOutputDevices() override;
+ bool HasAudioInputDevices() override;
+ void ShowAudioInputSettings() override;
+ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
+ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
+ AudioParameters GetInputStreamParameters(
const std::string& device_id) override;
- virtual void SetHasKeyboardMic() override;
+ void SetHasKeyboardMic() override;
// AudioManagerBase implementation.
- virtual AudioOutputStream* MakeLinearOutputStream(
+ AudioOutputStream* MakeLinearOutputStream(
const AudioParameters& params) override;
- virtual AudioOutputStream* MakeLowLatencyOutputStream(
+ AudioOutputStream* MakeLowLatencyOutputStream(
+ const AudioParameters& params,
+ const std::string& device_id) override;
+ AudioInputStream* MakeLinearInputStream(
+ const AudioParameters& params,
+ const std::string& device_id) override;
+ AudioInputStream* MakeLowLatencyInputStream(
const AudioParameters& params,
const std::string& device_id) override;
- virtual AudioInputStream* MakeLinearInputStream(
- const AudioParameters& params, const std::string& device_id) override;
- virtual AudioInputStream* MakeLowLatencyInputStream(
- const AudioParameters& params, const std::string& device_id) override;
static snd_pcm_format_t BitsToFormat(int bits_per_sample);
protected:
- virtual ~AudioManagerCras();
+ ~AudioManagerCras() override;
- virtual AudioParameters GetPreferredOutputStreamParameters(
+ AudioParameters GetPreferredOutputStreamParameters(
const std::string& output_device_id,
const AudioParameters& input_params) override;

Powered by Google App Engine
This is Rietveld 408576698