From 36d0baf2083b071728893424e3daf9b770438d51 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Mon, 27 Aug 2012 20:58:56 +0000 Subject: [PATCH] Fixes in preparation for next Chromium roll. Review URL: https://webrtc-codereview.appspot.com/743004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2668 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/linux/audio_device_alsa_linux.cc | 2 -- .../main/source/linux/audio_device_alsa_linux.h | 3 --- .../main/source/linux/audio_device_utility_linux.cc | 3 +-- .../main/source/linux/audio_device_utility_linux.h | 1 - .../main/source/linux/audio_mixer_manager_pulse_linux.h | 5 +---- .../audio_device/main/source/mac/audio_device_mac.cc | 3 --- .../audio_device/main/source/mac/audio_device_mac.h | 3 --- .../main/source/linux/video_render_linux_impl.cc | 3 +-- .../main/source/linux/video_render_linux_impl.h | 6 +----- .../video_render/main/source/mac/video_render_nsopengl.h | 1 - .../video_render/main/source/mac/video_render_nsopengl.mm | 4 +--- third_party/google-gflags/google-gflags.gyp | 7 +++++-- 12 files changed, 10 insertions(+), 31 deletions(-) diff --git a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc b/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc index 0e0da6036a..14e166745f 100644 --- a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc +++ b/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc @@ -94,7 +94,6 @@ AudioDeviceLinuxALSA::AudioDeviceLinuxALSA(const WebRtc_Word32 id) : _playoutBuffer(NULL), _recordingFramesLeft(0), _playoutFramesLeft(0), - _playbackBufferSize(0), _playBufType(AudioDeviceModule::kFixedBufferSize), _initialized(false), _recording(false), @@ -104,7 +103,6 @@ AudioDeviceLinuxALSA::AudioDeviceLinuxALSA(const WebRtc_Word32 id) : _AGC(false), _recordingDelay(0), _playoutDelay(0), - _writeErrors(0), _playWarning(0), _playError(0), _recWarning(0), diff --git a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h b/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h index 8e96e137a7..20e555cbc5 100644 --- a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h +++ b/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h @@ -223,8 +223,6 @@ private: WebRtc_UWord32 _recordingFramesLeft; WebRtc_UWord32 _playoutFramesLeft; - WebRtc_UWord32 _playbackBufferSize; - AudioDeviceModule::BufferType _playBufType; private: @@ -238,7 +236,6 @@ private: snd_pcm_sframes_t _recordingDelay; snd_pcm_sframes_t _playoutDelay; - WebRtc_Word32 _writeErrors; WebRtc_UWord16 _playWarning; WebRtc_UWord16 _playError; WebRtc_UWord16 _recWarning; diff --git a/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc b/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc index a892e6bea6..25abcc9ae7 100644 --- a/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc +++ b/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc @@ -17,8 +17,7 @@ namespace webrtc { AudioDeviceUtilityLinux::AudioDeviceUtilityLinux(const WebRtc_Word32 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/src/modules/audio_device/main/source/linux/audio_device_utility_linux.h b/src/modules/audio_device/main/source/linux/audio_device_utility_linux.h index 8df7acc292..0e3c4103e3 100644 --- a/src/modules/audio_device/main/source/linux/audio_device_utility_linux.h +++ b/src/modules/audio_device/main/source/linux/audio_device_utility_linux.h @@ -29,7 +29,6 @@ public: private: CriticalSectionWrapper& _critSect; WebRtc_Word32 _id; - AudioDeviceModule::ErrorCode _lastError; }; } // namespace webrtc diff --git a/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.h b/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.h index 22d6da59a8..db0a5592a5 100644 --- a/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.h +++ b/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.h @@ -77,7 +77,7 @@ private: static void PaSourceInfoCallback(pa_context *c, const pa_source_info *i, int eol, void *pThis); static void - PaSetVolumeCallback(pa_context * /*c*/, int success, void */*pThis*/); + PaSetVolumeCallback(pa_context* /*c*/, int success, void* /*pThis*/); void PaSinkInfoCallbackHandler(const pa_sink_info *i, int eol); void PaSinkInputInfoCallbackHandler(const pa_sink_input_info *i, int eol); void PaSourceInfoCallbackHandler(const pa_source_info *i, int eol); @@ -111,9 +111,6 @@ private: mutable WebRtc_UWord8 _paChannels; bool _paObjectsSet; mutable bool _callbackValues; - - WebRtc_UWord8 _micVolChannels; - WebRtc_UWord8 _spkVolChannels; }; } diff --git a/src/modules/audio_device/main/source/mac/audio_device_mac.cc b/src/modules/audio_device/main/source/mac/audio_device_mac.cc index 6d44368c84..ecc95d7c65 100644 --- a/src/modules/audio_device/main/source/mac/audio_device_mac.cc +++ b/src/modules/audio_device/main/source/mac/audio_device_mac.cc @@ -130,9 +130,6 @@ AudioDeviceMac::AudioDeviceMac(const WebRtc_Word32 id) : _playing(false), _recIsInitialized(false), _playIsInitialized(false), - _startRec(false), - _stopRec(false), - _stopPlay(false), _AGC(false), _renderDeviceIsAlive(1), _captureDeviceIsAlive(1), diff --git a/src/modules/audio_device/main/source/mac/audio_device_mac.h b/src/modules/audio_device/main/source/mac/audio_device_mac.h index b84f71a35e..5106153bbd 100644 --- a/src/modules/audio_device/main/source/mac/audio_device_mac.h +++ b/src/modules/audio_device/main/source/mac/audio_device_mac.h @@ -341,9 +341,6 @@ private: bool _playing; bool _recIsInitialized; bool _playIsInitialized; - bool _startRec; - bool _stopRec; - bool _stopPlay; bool _AGC; // Atomically set varaibles diff --git a/src/modules/video_render/main/source/linux/video_render_linux_impl.cc b/src/modules/video_render/main/source/linux/video_render_linux_impl.cc index 3dc8ebce95..a9e0fe5411 100644 --- a/src/modules/video_render/main/source/linux/video_render_linux_impl.cc +++ b/src/modules/video_render/main/source/linux/video_render_linux_impl.cc @@ -25,8 +25,7 @@ VideoRenderLinuxImpl::VideoRenderLinuxImpl( _id(id), _renderLinuxCritsect( *CriticalSectionWrapper::CreateCriticalSection()), - _ptrWindow(window), _fullscreen(fullscreen), _ptrX11Render(NULL), - _renderType(videoRenderType) + _ptrWindow(window), _ptrX11Render(NULL) { } diff --git a/src/modules/video_render/main/source/linux/video_render_linux_impl.h b/src/modules/video_render/main/source/linux/video_render_linux_impl.h index 10460ec4d0..063ce2a3f3 100644 --- a/src/modules/video_render/main/source/linux/video_render_linux_impl.h +++ b/src/modules/video_render/main/source/linux/video_render_linux_impl.h @@ -123,13 +123,9 @@ private: CriticalSectionWrapper& _renderLinuxCritsect; void* _ptrWindow; - bool _fullscreen; - // X11 Render + // X11 Render VideoX11Render* _ptrX11Render; - - VideoRenderType _renderType; - }; } //namespace webrtc diff --git a/src/modules/video_render/main/source/mac/video_render_nsopengl.h b/src/modules/video_render/main/source/mac/video_render_nsopengl.h index 174ae2ad31..56058dc222 100644 --- a/src/modules/video_render/main/source/mac/video_render_nsopengl.h +++ b/src/modules/video_render/main/source/mac/video_render_nsopengl.h @@ -95,7 +95,6 @@ private: GLenum _pixelFormat; GLenum _pixelDataType; unsigned int _texture; - bool _bVideoSizeStartedChanging; }; class VideoRenderNSOpenGL diff --git a/src/modules/video_render/main/source/mac/video_render_nsopengl.mm b/src/modules/video_render/main/source/mac/video_render_nsopengl.mm index ac95d7055c..65b2e4832a 100644 --- a/src/modules/video_render/main/source/mac/video_render_nsopengl.mm +++ b/src/modules/video_render/main/source/mac/video_render_nsopengl.mm @@ -41,9 +41,7 @@ _bufferIsUpdated( false), _numberOfStreams( 0), _pixelFormat( GL_RGBA), _pixelDataType( GL_UNSIGNED_INT_8_8_8_8), -_texture( 0), -_bVideoSizeStartedChanging(false) - +_texture( 0) { } diff --git a/third_party/google-gflags/google-gflags.gyp b/third_party/google-gflags/google-gflags.gyp index cd75ad5d96..211280a041 100644 --- a/third_party/google-gflags/google-gflags.gyp +++ b/third_party/google-gflags/google-gflags.gyp @@ -56,9 +56,12 @@ 'src/windows/port.cc', ], }], - ['OS=="mac" and clang==1', { + # TODO(andrew): Look into fixing this warning upstream: + # http://code.google.com/p/webrtc/issues/detail?id=760 + ['clang==1', { + 'cflags!': ['-Wheader-hygiene',], 'xcode_settings': { - 'WARNING_CFLAGS!': ['-Wheader-hygiene'], + 'WARNING_CFLAGS!': ['-Wheader-hygiene',], }, }], ],