Enable cpplint for more webrtc subfolders and fix all uncovered cpplint errors.

webrtc/sound/pulseaudiosoundsystem.cc

 /*
  *  Copyright 2010 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/sound/pulseaudiosoundsystem.h"
 
 #ifdef HAVE_LIBPULSE
 
 #include <algorithm>
+#include <string>
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/fileutils.h"  // for GetApplicationName()
 #include "webrtc/base/logging.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/base/worker.h"
 #include "webrtc/sound/sounddevicelocator.h"
 #include "webrtc/sound/soundinputstreaminterface.h"
 #include "webrtc/sound/soundoutputstreaminterface.h"
@@ skipping 183 matching lines @@
   int flags_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioStream);
 };
 
 // Implementation of an input stream. See soundinputstreaminterface.h regarding
 // thread-safety.
 class PulseAudioInputStream :
     public SoundInputStreamInterface,
     private rtc::Worker {
-
-  struct GetVolumeCallbackData {
-    PulseAudioInputStream *instance;
-    pa_cvolume *channel_volumes;
-  };
-
-  struct GetSourceChannelCountCallbackData {
-    PulseAudioInputStream *instance;
-    uint8_t *channels;
-  };
-
  public:
   PulseAudioInputStream(PulseAudioSoundSystem *pulse,
                         pa_stream *stream,
                         int flags)
       : stream_(pulse, stream, flags),
         temp_sample_data_(NULL),
         temp_sample_data_size_(0) {
     // This callback seems to never be issued, but let's set it anyways.
     symbol_table()->pa_stream_set_overflow_callback()(stream, &OverflowCallback,
         NULL);
@@ skipping 139 matching lines @@
       Unlock();
     }
     return ret;
   }
 
   virtual int LatencyUsecs() {
     return stream_.LatencyUsecs();
   }
 
  private:
+  struct GetVolumeCallbackData {
+    PulseAudioInputStream* instance;
+    pa_cvolume* channel_volumes;
+  };
+
+  struct GetSourceChannelCountCallbackData {
+    PulseAudioInputStream* instance;
+    uint8_t* channels;
+  };
+
   void Lock() {
     stream_.Lock();
   }
 
   void Unlock() {
     stream_.Unlock();
   }
 
   PulseAudioSymbolTable *symbol_table() {
     return stream_.symbol_table();
@@ skipping 174 matching lines @@
   size_t temp_sample_data_size_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioInputStream);
 };
 
 // Implementation of an output stream. See soundoutputstreaminterface.h
 // regarding thread-safety.
 class PulseAudioOutputStream :
     public SoundOutputStreamInterface,
     private rtc::Worker {
-
-  struct GetVolumeCallbackData {
-    PulseAudioOutputStream *instance;
-    pa_cvolume *channel_volumes;
-  };
-
  public:
   PulseAudioOutputStream(PulseAudioSoundSystem *pulse,
                          pa_stream *stream,
                          int flags,
                          int latency)
       : stream_(pulse, stream, flags),
         configured_latency_(latency),
         temp_buffer_space_(0) {
     symbol_table()->pa_stream_set_underflow_callback()(stream,
                                                        &UnderflowCallbackThunk,
@@ skipping 127 matching lines @@
       Unlock();
     }
     return ret;
   }
 
   virtual int LatencyUsecs() {
     return stream_.LatencyUsecs();
   }
 
 #if 0
-  // TODO: Versions 0.9.16 and later of Pulse have a new API for
+  // TODO(henrika): Versions 0.9.16 and later of Pulse have a new API for
   // zero-copy writes, but Hardy is not new enough to have that so we can't
   // rely on it. Perhaps auto-detect if it's present or not and use it if we
   // can?
 
   virtual bool GetWriteBuffer(void **buffer, size_t *size) {
     bool ret = true;
     Lock();
     if (symbol_table()->pa_stream_begin_write()(stream_.stream(), buffer, size)
             != 0) {
       LOG(LS_ERROR) << "Can't get write buffer";
@@ skipping 23 matching lines @@
         LOG(LS_ERROR) << "Unable to write";
         ret = false;
       }
     }
     Unlock();
     return ret;
   }
 #endif
 
  private:
+  struct GetVolumeCallbackData {
+    PulseAudioOutputStream* instance;
+    pa_cvolume* channel_volumes;
+  };
+
   void Lock() {
     stream_.Lock();
   }
 
   void Unlock() {
     stream_.Unlock();
   }
 
   PulseAudioSymbolTable *symbol_table() {
     return stream_.symbol_table();
@@ skipping 368 matching lines @@
   // change later, because the pointer to "data" will be invalid after return
   // from this function.
   symbol_table_.pa_context_set_state_callback()(context, NULL, NULL);
   return ret;
 }
 
 // Must be called with the lock held.
 pa_context *PulseAudioSoundSystem::CreateNewConnection() {
   // Create connection context.
   std::string app_name;
-  // TODO: Pulse etiquette says this name should be localized. Do
+  // TODO(henrika): Pulse etiquette says this name should be localized. Do
   // we care?
   rtc::Filesystem::GetApplicationName(&app_name);
   pa_context *context = symbol_table_.pa_context_new()(
       symbol_table_.pa_threaded_mainloop_get_api()(mainloop_),
       app_name.c_str());
   if (!context) {
     LOG(LS_ERROR) << "Can't create context";
     goto fail0;
   }
 
@@ skipping 355 matching lines @@
 
 // Must be called with the lock held.
 const char *PulseAudioSoundSystem::LastError() {
   return symbol_table_.pa_strerror()(symbol_table_.pa_context_errno()(
       context_));
 }
 
 }  // namespace rtc
 
 #endif  // HAVE_LIBPULSE