Index: webrtc/modules/audio_device/android/audio_track_jni.cc |
diff --git a/webrtc/modules/audio_device/android/audio_track_jni.cc b/webrtc/modules/audio_device/android/audio_track_jni.cc |
index 29b21ae998eb47939f925651b0f8a014406f0562..c6608684f35655ff7da6d1c82fd07cf8b867ef34 100644 |
--- a/webrtc/modules/audio_device/android/audio_track_jni.cc |
+++ b/webrtc/modules/audio_device/android/audio_track_jni.cc |
@@ -11,6 +11,8 @@ |
#include "webrtc/modules/audio_device/android/audio_manager.h" |
#include "webrtc/modules/audio_device/android/audio_track_jni.h" |
+#include <utility> |
+ |
#include <android/log.h> |
#include "webrtc/base/arraysize.h" |
@@ -28,16 +30,16 @@ namespace webrtc { |
// AudioTrackJni::JavaAudioTrack implementation. |
AudioTrackJni::JavaAudioTrack::JavaAudioTrack( |
- NativeRegistration* native_reg, rtc::scoped_ptr<GlobalRef> audio_track) |
- : audio_track_(audio_track.Pass()), |
+ NativeRegistration* native_reg, |
+ rtc::scoped_ptr<GlobalRef> audio_track) |
+ : audio_track_(std::move(audio_track)), |
init_playout_(native_reg->GetMethodId("initPlayout", "(II)V")), |
start_playout_(native_reg->GetMethodId("startPlayout", "()Z")), |
stop_playout_(native_reg->GetMethodId("stopPlayout", "()Z")), |
set_stream_volume_(native_reg->GetMethodId("setStreamVolume", "(I)Z")), |
- get_stream_max_volume_(native_reg->GetMethodId( |
- "getStreamMaxVolume", "()I")), |
- get_stream_volume_(native_reg->GetMethodId("getStreamVolume", "()I")) { |
-} |
+ get_stream_max_volume_( |
+ native_reg->GetMethodId("getStreamMaxVolume", "()I")), |
+ get_stream_volume_(native_reg->GetMethodId("getStreamVolume", "()I")) {} |
AudioTrackJni::JavaAudioTrack::~JavaAudioTrack() {} |