diff --git a/webrtc/modules/audio_device/android/audio_device_jni_android.cc b/webrtc/modules/audio_device/android/audio_device_jni_android.cc index 93932eb25..8afdc5026 100644 --- a/webrtc/modules/audio_device/android/audio_device_jni_android.cc +++ b/webrtc/modules/audio_device/android/audio_device_jni_android.cc @@ -135,8 +135,8 @@ AudioDeviceAndroidJni::AudioDeviceAndroidJni(const int32_t id) : _playoutDeviceIsSpecified(false), _initialized(false), _recording(false), _playing(false), _recIsInitialized(false), _playIsInitialized(false), _micIsInitialized(false), - _speakerIsInitialized(false), _startRec(false), _stopRec(false), - _startPlay(false), _stopPlay(false), _playWarning(0), + _speakerIsInitialized(false), _startRec(false), + _startPlay(false), _playWarning(0), _playError(0), _recWarning(0), _recError(0), _delayPlayout(0), _delayRecording(0), _AGC(false), diff --git a/webrtc/modules/audio_device/android/audio_device_jni_android.h b/webrtc/modules/audio_device/android/audio_device_jni_android.h index 66318679c..33aa95239 100644 --- a/webrtc/modules/audio_device/android/audio_device_jni_android.h +++ b/webrtc/modules/audio_device/android/audio_device_jni_android.h @@ -214,9 +214,7 @@ class AudioDeviceAndroidJni : public AudioDeviceGeneric { // Signal flags to threads bool _startRec; - bool _stopRec; bool _startPlay; - bool _stopPlay; // Warnings and errors uint16_t _playWarning; diff --git a/webrtc/modules/audio_device/android/audio_device_utility_android.cc b/webrtc/modules/audio_device/android/audio_device_utility_android.cc index 20d029049..c21972fac 100644 --- a/webrtc/modules/audio_device/android/audio_device_utility_android.cc +++ b/webrtc/modules/audio_device/android/audio_device_utility_android.cc @@ -21,8 +21,7 @@ namespace webrtc { AudioDeviceUtilityAndroid::AudioDeviceUtilityAndroid(const int32_t id) : - _critSect(*CriticalSectionWrapper::CreateCriticalSection()), _id(id), - _lastError(AudioDeviceModule::kAdmErrNone) + _critSect(*CriticalSectionWrapper::CreateCriticalSection()), _id(id) { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, id, "%s created", __FUNCTION__); diff --git a/webrtc/modules/audio_device/android/audio_device_utility_android.h b/webrtc/modules/audio_device/android/audio_device_utility_android.h index a86896d4b..24644b893 100644 --- a/webrtc/modules/audio_device/android/audio_device_utility_android.h +++ b/webrtc/modules/audio_device/android/audio_device_utility_android.h @@ -33,7 +33,6 @@ public: private: CriticalSectionWrapper& _critSect; int32_t _id; - AudioDeviceModule::ErrorCode _lastError; }; } // namespace webrtc diff --git a/webrtc/modules/video_render/android/video_render_opengles20.h b/webrtc/modules/video_render/android/video_render_opengles20.h index 9553d4dfa..2f2b68ffd 100644 --- a/webrtc/modules/video_render/android/video_render_opengles20.h +++ b/webrtc/modules/video_render/android/video_render_opengles20.h @@ -41,7 +41,6 @@ class VideoRenderOpenGles20 { int32_t _id; GLuint _textureIds[3]; // Texture id of Y,U and V texture. GLuint _program; - GLuint _vPositionHandle; GLsizei _textureWidth; GLsizei _textureHeight;