diff options
author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 14:56:15 +0000 |
---|---|---|
committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 14:56:15 +0000 |
commit | b11d82e170f4193964b1d9ac80dce863546c8c3a (patch) | |
tree | 3180080aadeeca92ea613bfe3a0713157f333463 /media/audio/audio_manager_base.h | |
parent | ffe56ba5c6d94580b52645c9b36d22b0e17ba66e (diff) | |
download | chromium_src-b11d82e170f4193964b1d9ac80dce863546c8c3a.zip chromium_src-b11d82e170f4193964b1d9ac80dce863546c8c3a.tar.gz chromium_src-b11d82e170f4193964b1d9ac80dce863546c8c3a.tar.bz2 |
Removed the IsRecordingInProcess check for speech since it is not needed.
The check is wrong since other clients doing capturing should not prevent speech start recording.
BUG=238800
TEST=goto www.corp.google.com/~dou/audio/audio_speech_crash/speech_input.html, the speech recognizer should work on ChromeOS
R=dalecurtis@chromium.org, joi@chromium.org, primiano@chromium.org
Review URL: https://codereview.chromium.org/16286010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_manager_base.h')
-rw-r--r-- | media/audio/audio_manager_base.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index 4bc4d38..8b34d9f 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -8,7 +8,6 @@ #include <string> #include <utility> -#include "base/atomic_ref_count.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" @@ -61,15 +60,10 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { const AudioParameters& params, const std::string& input_device_id) OVERRIDE; - virtual bool IsRecordingInProcess() OVERRIDE; - // Called internally by the audio stream when it has been closed. virtual void ReleaseOutputStream(AudioOutputStream* stream); virtual void ReleaseInputStream(AudioInputStream* stream); - void IncreaseActiveInputStreamCount(); - void DecreaseActiveInputStreamCount(); - // Creates the output stream for the |AUDIO_PCM_LINEAR| format. The legacy // name is also from |AUDIO_PCM_LINEAR|. virtual AudioOutputStream* MakeLinearOutputStream( @@ -137,10 +131,6 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { // Called by Shutdown(). void ShutdownOnAudioThread(); - // Counts the number of active input streams to find out if something else - // is currently recording in Chrome. - base::AtomicRefCount num_active_input_streams_; - // Max number of open output streams, modified by // SetMaxOutputStreamsAllowed(). int max_num_output_streams_; |