Cleaning up src/media to be consistent with static versus anonymous namespaces.

media/audio/win/waveout_output_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/win/waveout_output_win.h"
 
 #include <windows.h>
 #include <mmsystem.h>
 #pragma comment(lib, "winmm.lib")
 
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 //   thus it forces you to maintain state, which naturally is not exactly
 //   synchronized to the actual device state.
 // - Some functions, like waveOutReset cannot be called in the callback thread
 //   or called in any random state because they deadlock. This results in a
 //   non- instantaneous Stop() method. waveOutPrepareHeader seems to be in the
 //   same boat.
 // - waveOutReset() will forcefully kill the _waveThread so it is important
 //   to make sure we are not executing inside the audio source's OnMoreData()
 //   or that we take locks inside WaveCallback() or QueueNextPacket().
 
-namespace {
 // Sixty four MB is the maximum buffer size per AudioOutputStream.
-const uint32 kMaxOpenBufferSize = 1024 * 1024 * 64;
+static const uint32 kMaxOpenBufferSize = 1024 * 1024 * 64;
 
 // Our sound buffers are allocated once and kept in a linked list using the
 // the WAVEHDR::dwUser variable. The last buffer points to the first buffer.
-WAVEHDR* GetNextBuffer(WAVEHDR* current) {
+static WAVEHDR* GetNextBuffer(WAVEHDR* current) {
   return reinterpret_cast<WAVEHDR*>(current->dwUser);
 }
 
-}  // namespace
-
 // See Also
 // http://www.thx.com/consumer/home-entertainment/home-theater/surround-sound-speaker-set-up/
 // http://en.wikipedia.org/wiki/Surround_sound
 
-const int kMaxChannelsToMask = 8;
-const unsigned int kChannelsToMask[kMaxChannelsToMask + 1] = {
+static const int kMaxChannelsToMask = 8;
+static const unsigned int kChannelsToMask[kMaxChannelsToMask + 1] = {
   0,
   // 1 = Mono
   SPEAKER_FRONT_CENTER,
   // 2 = Stereo
   SPEAKER_FRONT_LEFT  | SPEAKER_FRONT_RIGHT,
   // 3 = Stereo + Center
   SPEAKER_FRONT_LEFT  | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER,
   // 4 = Quad
   SPEAKER_FRONT_LEFT  | SPEAKER_FRONT_RIGHT |
   SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT,
@@ skipping 281 matching lines @@
     // Time to send the buffer to the audio driver. Since we are reusing
     // the same buffers we can get away without calling waveOutPrepareHeader.
     MMRESULT result = ::waveOutWrite(hwo, buffer, sizeof(WAVEHDR));
     if (result != MMSYSERR_NOERROR)
       obj->HandleError(result);
 
     obj->pending_bytes_ += buffer->dwBufferLength;
 
   }
 }