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

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),

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;

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__);

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

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;
 };
 
 }

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),

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

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)
 {
 }
 

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

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

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)
 {
 
 }

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',],
           },
         }],
       ],