summaryrefslogtreecommitdiffstats
path: root/media/audio
diff options
context:
space:
mode:
Diffstat (limited to 'media/audio')
-rw-r--r--media/audio/audio_input_controller.cc4
-rw-r--r--media/audio/audio_input_device.cc5
-rw-r--r--media/audio/audio_output_device.cc3
-rw-r--r--media/audio/sounds/audio_stream_handler.cc6
4 files changed, 11 insertions, 7 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index dc207b0..8ab709d 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -4,6 +4,8 @@
#include "media/audio/audio_input_controller.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
@@ -730,7 +732,7 @@ void AudioInputController::WriteInputDataForDebugging(
scoped_ptr<AudioBus> data) {
DCHECK(task_runner_->BelongsToCurrentThread());
if (input_writer_)
- input_writer_->Write(data.Pass());
+ input_writer_->Write(std::move(data));
}
} // namespace media
diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc
index ae64f34..52017f2 100644
--- a/media/audio/audio_input_device.cc
+++ b/media/audio/audio_input_device.cc
@@ -5,6 +5,7 @@
#include "media/audio/audio_input_device.h"
#include <stdint.h>
+#include <utility>
#include "base/bind.h"
#include "base/macros.h"
@@ -56,7 +57,7 @@ AudioInputDevice::AudioInputDevice(
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
: ScopedTaskRunnerObserver(io_task_runner),
callback_(NULL),
- ipc_(ipc.Pass()),
+ ipc_(std::move(ipc)),
state_(IDLE),
session_id_(0),
agc_is_enabled_(false),
@@ -296,7 +297,7 @@ void AudioInputDevice::AudioThreadCallback::MapSharedMemory() {
reinterpret_cast<media::AudioInputBuffer*>(ptr);
scoped_ptr<media::AudioBus> audio_bus =
media::AudioBus::WrapMemory(audio_parameters_, buffer->audio);
- audio_buses_.push_back(audio_bus.Pass());
+ audio_buses_.push_back(std::move(audio_bus));
ptr += segment_length_;
}
}
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index 6c5d59e..3af32b7 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/callback_helpers.h"
#include "base/macros.h"
@@ -51,7 +52,7 @@ AudioOutputDevice::AudioOutputDevice(
const url::Origin& security_origin)
: ScopedTaskRunnerObserver(io_task_runner),
callback_(NULL),
- ipc_(ipc.Pass()),
+ ipc_(std::move(ipc)),
state_(IDLE),
start_on_authorized_(false),
play_on_start_(true),
diff --git a/media/audio/sounds/audio_stream_handler.cc b/media/audio/sounds/audio_stream_handler.cc
index 373a3ed..62235c9 100644
--- a/media/audio/sounds/audio_stream_handler.cc
+++ b/media/audio/sounds/audio_stream_handler.cc
@@ -5,8 +5,8 @@
#include "media/audio/sounds/audio_stream_handler.h"
#include <stdint.h>
-
#include <string>
+#include <utility>
#include "base/cancelable_callback.h"
#include "base/logging.h"
@@ -45,7 +45,7 @@ class AudioStreamHandler::AudioStreamContainer
stream_(NULL),
cursor_(0),
delayed_stop_posted_(false),
- wav_audio_(wav_audio.Pass()) {
+ wav_audio_(std::move(wav_audio)) {
DCHECK(wav_audio_);
}
@@ -188,7 +188,7 @@ AudioStreamHandler::AudioStreamHandler(const base::StringPiece& wav_data) {
// Store the duration of the WAV data then pass the handler to |stream_|.
duration_ = wav_audio->GetDuration();
- stream_.reset(new AudioStreamContainer(wav_audio.Pass()));
+ stream_.reset(new AudioStreamContainer(std::move(wav_audio)));
}
AudioStreamHandler::~AudioStreamHandler() {