diff options
| author | rvargas <rvargas@chromium.org> | 2014-09-24 18:21:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-25 01:22:12 +0000 |
| commit | b5f04cacb6ee63d5417ae58158a8d06e11845580 (patch) | |
| tree | 38a524383a3ab023f67cdcc5dc7bc8b6ebd61c5f /media | |
| parent | d1ab0241ee29c70bd08531d1f038964664b124b6 (diff) | |
| download | chromium_src-b5f04cacb6ee63d5417ae58158a8d06e11845580.zip chromium_src-b5f04cacb6ee63d5417ae58158a8d06e11845580.tar.gz chromium_src-b5f04cacb6ee63d5417ae58158a8d06e11845580.tar.bz2 | |
Remove implicit HANDLE conversions from media.
BUG=416722
R=shadi@chromium.org
Review URL: https://codereview.chromium.org/598243002
Cr-Commit-Position: refs/heads/master@{#296609}
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/win/audio_low_latency_input_win.cc | 3 | ||||
| -rw-r--r-- | media/audio/win/audio_low_latency_output_win.cc | 4 | ||||
| -rw-r--r-- | media/audio/win/wavein_input_win.cc | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/media/audio/win/audio_low_latency_input_win.cc b/media/audio/win/audio_low_latency_input_win.cc index 29a2e7d..9fe061b 100644 --- a/media/audio/win/audio_low_latency_input_win.cc +++ b/media/audio/win/audio_low_latency_input_win.cc @@ -365,7 +365,8 @@ void WASAPIAudioInputStream::Run() { bool recording = true; bool error = false; double volume = GetVolume(); - HANDLE wait_array[2] = {stop_capture_event_, audio_samples_ready_event_}; + HANDLE wait_array[2] = + { stop_capture_event_.Get(), audio_samples_ready_event_.Get() }; while (recording && !error) { HRESULT hr = S_FALSE; diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc index 15cabbaf..53dcbfe 100644 --- a/media/audio/win/audio_low_latency_output_win.cc +++ b/media/audio/win/audio_low_latency_output_win.cc @@ -356,8 +356,8 @@ void WASAPIAudioOutputStream::Run() { bool playing = true; bool error = false; - HANDLE wait_array[] = { stop_render_event_, - audio_samples_render_event_ }; + HANDLE wait_array[] = { stop_render_event_.Get(), + audio_samples_render_event_.Get() }; UINT64 device_frequency = 0; // The device frequency is the frequency generated by the hardware clock in diff --git a/media/audio/win/wavein_input_win.cc b/media/audio/win/wavein_input_win.cc index f12bcf2..e96a877 100644 --- a/media/audio/win/wavein_input_win.cc +++ b/media/audio/win/wavein_input_win.cc @@ -162,7 +162,7 @@ void PCMWaveInAudioInputStream::Stop() { return; // Wait for the callback to finish, it will signal us when ready to be reset. - DWORD wait = ::WaitForSingleObject(stopped_event_, INFINITE); + DWORD wait = ::WaitForSingleObject(stopped_event_.Get(), INFINITE); DCHECK_EQ(wait, WAIT_OBJECT_0); // Stop input and reset the current position to zero for |wavein_|. @@ -308,7 +308,7 @@ void PCMWaveInAudioInputStream::WaveCallback(HWAVEIN hwi, UINT msg, // Main thread has called Stop() and set |callback_| to NULL and is // now waiting to issue waveInReset which will kill this thread. // We should not call AudioSourceCallback code anymore. - ::SetEvent(obj->stopped_event_); + ::SetEvent(obj->stopped_event_.Get()); } } else if (msg == WIM_CLOSE) { // Intentionaly no-op for now. |