diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 23:37:51 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 23:37:51 +0000 |
| commit | 05643d0f9575c171f13e7f30ea0f1d4520855f87 (patch) | |
| tree | 8b06bb5488b99cbfc0e3e6af8b721b6627048f14 /media/audio/mac | |
| parent | 200c9187bd8029de9a6d4665082c7bf358c62829 (diff) | |
| download | chromium_src-05643d0f9575c171f13e7f30ea0f1d4520855f87.zip chromium_src-05643d0f9575c171f13e7f30ea0f1d4520855f87.tar.gz chromium_src-05643d0f9575c171f13e7f30ea0f1d4520855f87.tar.bz2 | |
Remove an unused OnClose() method from AudioInputCallback.
BUG=328357
Review URL: https://codereview.chromium.org/107093010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/mac')
| -rw-r--r-- | media/audio/mac/audio_input_mac.cc | 8 | ||||
| -rw-r--r-- | media/audio/mac/audio_low_latency_input_mac.cc | 11 | ||||
| -rw-r--r-- | media/audio/mac/audio_low_latency_input_mac_unittest.cc | 16 |
3 files changed, 8 insertions, 27 deletions
diff --git a/media/audio/mac/audio_input_mac.cc b/media/audio/mac/audio_input_mac.cc index 4aee117..8f98eed 100644 --- a/media/audio/mac/audio_input_mac.cc +++ b/media/audio/mac/audio_input_mac.cc @@ -85,9 +85,12 @@ void PCMQueueInAudioInputStream::Stop() { HandleError(err); started_ = false; + callback_ = NULL; } void PCMQueueInAudioInputStream::Close() { + Stop(); + // It is valid to call Close() before calling Open() or Start(), thus // |audio_queue_| and |callback_| might be NULL. if (audio_queue_) { @@ -96,10 +99,7 @@ void PCMQueueInAudioInputStream::Close() { if (err != noErr) HandleError(err); } - if (callback_) { - callback_->OnClose(this); - callback_ = NULL; - } + manager_->ReleaseInputStream(this); // CARE: This object may now be destroyed. } diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc index dbc75bf..5623bce 100644 --- a/media/audio/mac/audio_low_latency_input_mac.cc +++ b/media/audio/mac/audio_low_latency_input_mac.cc @@ -289,9 +289,10 @@ void AUAudioInputStream::Stop() { return; StopAgc(); OSStatus result = AudioOutputUnitStop(audio_unit_); - if (result == noErr) { - started_ = false; - } + DCHECK_EQ(result, noErr); + started_ = false; + sink_ = NULL; + OSSTATUS_DLOG_IF(ERROR, result != noErr, result) << "Failed to stop acquiring data"; } @@ -310,10 +311,6 @@ void AUAudioInputStream::Close() { CloseComponent(audio_unit_); audio_unit_ = 0; } - if (sink_) { - sink_->OnClose(this); - sink_ = NULL; - } // Inform the audio manager that we have been closed. This can cause our // destruction. diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc index 9360bef..e80cbcd 100644 --- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc +++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc @@ -33,7 +33,6 @@ class MockAudioInputCallback : public AudioInputStream::AudioInputCallback { MOCK_METHOD5(OnData, void(AudioInputStream* stream, const uint8* src, uint32 size, uint32 hardware_delay_bytes, double volume)); - MOCK_METHOD1(OnClose, void(AudioInputStream* stream)); MOCK_METHOD1(OnError, void(AudioInputStream* stream)); }; @@ -84,7 +83,6 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { } } - virtual void OnClose(AudioInputStream* stream) OVERRIDE {} virtual void OnError(AudioInputStream* stream) OVERRIDE {} private: @@ -162,8 +160,6 @@ TEST_F(MacAudioInputTest, AUAudioInputStreamOpenStartAndClose) { EXPECT_TRUE(ais->Open()); MockAudioInputCallback sink; ais->Start(&sink); - EXPECT_CALL(sink, OnClose(ais)) - .Times(1); ais->Close(); } @@ -176,8 +172,6 @@ TEST_F(MacAudioInputTest, AUAudioInputStreamOpenStartStopAndClose) { MockAudioInputCallback sink; ais->Start(&sink); ais->Stop(); - EXPECT_CALL(sink, OnClose(ais)) - .Times(1); ais->Close(); } @@ -206,8 +200,6 @@ TEST_F(MacAudioInputTest, AUAudioInputStreamMiscCallingSequences) { ais->Stop(); EXPECT_FALSE(auais->started()); - EXPECT_CALL(sink, OnClose(ais)) - .Times(1); ais->Close(); } @@ -239,10 +231,6 @@ TEST_F(MacAudioInputTest, AUAudioInputStreamVerifyMonoRecording) { ais->Start(&sink); loop.Run(); ais->Stop(); - - // Verify that the sink receieves OnClose() call when calling Close(). - EXPECT_CALL(sink, OnClose(ais)) - .Times(1); ais->Close(); } @@ -281,10 +269,6 @@ TEST_F(MacAudioInputTest, AUAudioInputStreamVerifyStereoRecording) { ais->Start(&sink); loop.Run(); ais->Stop(); - - // Verify that the sink receieves OnClose() call when calling Close(). - EXPECT_CALL(sink, OnClose(ais)) - .Times(1); ais->Close(); } |