Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: media/audio/win/waveout_output_win.cc

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/win/core_audio_util_win.cc ('k') | media/base/android/media_codec_bridge.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/audio/win/waveout_output_win.h" 5 #include "media/audio/win/waveout_output_win.h"
6 6
7 #include <windows.h>
8 #include <mmsystem.h>
9 #pragma comment(lib, "winmm.lib") 7 #pragma comment(lib, "winmm.lib")
10 8
11 #include "base/atomicops.h" 9 #include "base/atomicops.h"
12 #include "base/basictypes.h" 10 #include "base/basictypes.h"
13 #include "base/logging.h" 11 #include "base/logging.h"
14 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
15 #include "media/audio/audio_io.h" 13 #include "media/audio/audio_io.h"
16 #include "media/audio/win/audio_manager_win.h" 14 #include "media/audio/win/audio_manager_win.h"
17 15
18 namespace media { 16 namespace media {
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 buffer, 386 buffer,
389 sizeof(WAVEHDR)); 387 sizeof(WAVEHDR));
390 if (result != MMSYSERR_NOERROR) 388 if (result != MMSYSERR_NOERROR)
391 stream->HandleError(result); 389 stream->HandleError(result);
392 stream->pending_bytes_ += buffer->dwBufferLength; 390 stream->pending_bytes_ += buffer->dwBufferLength;
393 } 391 }
394 } 392 }
395 } 393 }
396 394
397 } // namespace media 395 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/win/core_audio_util_win.cc ('k') | media/base/android/media_codec_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698