| Index: content/browser/renderer_host/media/audio_sync_reader.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/media/audio_sync_reader.cc (revision 152430)
|
| +++ content/browser/renderer_host/media/audio_sync_reader.cc (working copy)
|
| @@ -10,7 +10,7 @@
|
| #include "base/shared_memory.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "media/audio/audio_buffers_state.h"
|
| -#include "media/audio/shared_memory_util.h"
|
| +#include "media/audio/audio_util.h"
|
|
|
| #if defined(OS_WIN)
|
| const int kMinIntervalBetweenReadCallsInMs = 10;
|
| @@ -31,7 +31,7 @@
|
|
|
| // media::AudioOutputController::SyncReader implementations.
|
| void AudioSyncReader::UpdatePendingBytes(uint32 bytes) {
|
| - if (bytes != static_cast<uint32>(media::kPauseMark)) {
|
| + if (bytes != static_cast<uint32>(media::AudioOutputController::kPauseMark)) {
|
| // Store unknown length of data into buffer, so we later
|
| // can find out if data became available.
|
| media::SetUnknownDataSize(
|
|
|
| Property changes on: content/browser/renderer_host/media/audio_sync_reader.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|