diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 20:04:29 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 20:04:29 +0000 |
| commit | 40e5ac1f115a7905372d3414debaac63a5244886 (patch) | |
| tree | 1613d237a6e69e0d1f95b1953b8b2572a9f5b52a /media/audio | |
| parent | b0c2bda2081e3627baac5814d6c66ef121b88515 (diff) | |
| download | chromium_src-40e5ac1f115a7905372d3414debaac63a5244886.zip chromium_src-40e5ac1f115a7905372d3414debaac63a5244886.tar.gz chromium_src-40e5ac1f115a7905372d3414debaac63a5244886.tar.bz2 | |
andrew's patch
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
| -rw-r--r-- | media/audio/audio_output.h | 1 | ||||
| -rw-r--r-- | media/audio/win/audio_manager_win.h | 1 | ||||
| -rw-r--r-- | media/audio/win/audio_output_win_unittest.cc | 2 | ||||
| -rw-r--r-- | media/audio/win/waveout_output_win.cc | 1 | ||||
| -rw-r--r-- | media/audio/win/waveout_output_win.h | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/media/audio/audio_output.h b/media/audio/audio_output.h index 0cfca08..8f95a70 100644 --- a/media/audio/audio_output.h +++ b/media/audio/audio_output.h @@ -160,3 +160,4 @@ class AudioManager { #endif // MEDIA_AUDIO_AUDIO_OUTPUT_H_ + diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h index 12a4c06..7ade9ec 100644 --- a/media/audio/win/audio_manager_win.h +++ b/media/audio/win/audio_manager_win.h @@ -40,3 +40,4 @@ class AudioManagerWin : public AudioManager { }; #endif // MEDIA_AUDIO_AUDIO_MANAGER_WIN_H_ + diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc index d0db853..25dd7e6 100644 --- a/media/audio/win/audio_output_win_unittest.cc +++ b/media/audio/win/audio_output_win_unittest.cc @@ -5,6 +5,7 @@ #include <windows.h> #include "base/basictypes.h" +#include "base/logging.h" #include "media/audio/audio_output.h" #include "media/audio/simple_sources.h" #include "testing/gtest/include/gtest/gtest.h" @@ -282,3 +283,4 @@ TEST(WinAudioTest, PCMWaveStreamPlay200HzTone22Kss) { oas->Stop(); oas->Close(); } + diff --git a/media/audio/win/waveout_output_win.cc b/media/audio/win/waveout_output_win.cc index 95f70ab..fa84884 100644 --- a/media/audio/win/waveout_output_win.cc +++ b/media/audio/win/waveout_output_win.cc @@ -251,3 +251,4 @@ void PCMWaveOutAudioOutputStream::WaveCallback(HWAVEOUT hwo, UINT msg, obj->callback_->OnClose(obj); } } + diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h index 1c8ffa6..bdf35b3 100644 --- a/media/audio/win/waveout_output_win.h +++ b/media/audio/win/waveout_output_win.h @@ -103,3 +103,4 @@ class PCMWaveOutAudioOutputStream : public AudioOutputStream { }; #endif // MEDIA_AUDIO_WAVEOUT_OUTPUT_WIN_H_ + |