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

Unified Diff: chromeos/dbus/audio_dsp_client.cc

Issue 1540803002: Switch to standard integer types in chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more includes Created 5 years 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
« no previous file with comments | « chromeos/dbus/audio_dsp_client.h ('k') | chromeos/dbus/audio_node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/audio_dsp_client.cc
diff --git a/chromeos/dbus/audio_dsp_client.cc b/chromeos/dbus/audio_dsp_client.cc
index 74a8dcd9675b1ffb578c2a5da7f50b0d0185e46e..94b3992199037a5b41e782dafdf3e597d8b449e6 100644
--- a/chromeos/dbus/audio_dsp_client.cc
+++ b/chromeos/dbus/audio_dsp_client.cc
@@ -4,7 +4,10 @@
#include "chromeos/dbus/audio_dsp_client.h"
+#include <stdint.h>
+
#include "base/bind.h"
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/observer_list.h"
@@ -131,16 +134,16 @@ class AudioDspClientImpl : public AudioDspClient {
void GetBass(const DoubleDBusMethodCallback& callback) override;
void GetCapabilitiesOEM(
const ThreeStringDBusMethodCallback& callback) override;
- void SetCapabilitiesOEM(uint32 speaker_id,
+ void SetCapabilitiesOEM(uint32_t speaker_id,
const std::string& speaker_capabilities,
const std::string& driver_capabilities,
const VoidDBusMethodCallback& callback) override;
- void GetFilterConfigOEM(uint32 speaker_id,
+ void GetFilterConfigOEM(uint32_t speaker_id,
const TwoStringDBusMethodCallback& callback) override;
void SetFilterConfigOEM(const std::string& speaker_config,
const std::string& driver_config,
const VoidDBusMethodCallback& callback) override;
- void SetSourceType(uint16 source_type,
+ void SetSourceType(uint16_t source_type,
const VoidDBusMethodCallback& callback) override;
void AmplifierVolumeChanged(double db_spl,
const VoidDBusMethodCallback& callback) override;
@@ -287,7 +290,7 @@ void AudioDspClientImpl::GetCapabilitiesOEM(
}
void AudioDspClientImpl::SetCapabilitiesOEM(
- uint32 speaker_id,
+ uint32_t speaker_id,
const std::string& speaker_capabilities,
const std::string& driver_capabilities,
const VoidDBusMethodCallback& callback) {
@@ -303,7 +306,7 @@ void AudioDspClientImpl::SetCapabilitiesOEM(
}
void AudioDspClientImpl::GetFilterConfigOEM(
- uint32 speaker_id,
+ uint32_t speaker_id,
const TwoStringDBusMethodCallback& callback) {
dbus::MethodCall method_call(audio_dsp::kAudioDspInterface,
audio_dsp::kGetFilterConfigOEMMethod);
@@ -328,7 +331,7 @@ void AudioDspClientImpl::SetFilterConfigOEM(
base::Bind(&OnVoidDBusMethod, callback));
}
-void AudioDspClientImpl::SetSourceType(uint16 source_type,
+void AudioDspClientImpl::SetSourceType(uint16_t source_type,
const VoidDBusMethodCallback& callback) {
dbus::MethodCall method_call(audio_dsp::kAudioDspInterface,
audio_dsp::kSetSourceTypeMethod);
@@ -353,7 +356,7 @@ void AudioDspClientImpl::AmplifierVolumeChanged(
void AudioDspClientImpl::OnError(dbus::Signal* signal) {
dbus::MessageReader reader(signal);
- int32 error_code = 0;
+ int32_t error_code = 0;
if (!reader.PopInt32(&error_code)) {
LOG(ERROR) << "Invalid signal: " << signal->ToString();
return;
« no previous file with comments | « chromeos/dbus/audio_dsp_client.h ('k') | chromeos/dbus/audio_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698