diff options
author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 23:49:56 +0000 |
---|---|---|
committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 23:49:56 +0000 |
commit | 7aac3055e4809d516b05ddb9dd063346c2f94514 (patch) | |
tree | 17062b983be0063e60d63709065797f9aa61cc57 /ppapi/cpp | |
parent | 81c5deaba63aaddb9fcac95b4c1364f19edd6270 (diff) | |
download | chromium_src-7aac3055e4809d516b05ddb9dd063346c2f94514.zip chromium_src-7aac3055e4809d516b05ddb9dd063346c2f94514.tar.gz chromium_src-7aac3055e4809d516b05ddb9dd063346c2f94514.tar.bz2 |
Revert 110587 - Microphone support for Pepper Flash.
[Committing for pbrophy@adobe.com. Original review:
http://codereview.chromium.org/8138008/ .]
This change supports audio capture from the microphone and supplies the data
through a Pepper interface. Its enumeration is limited to the default audio
device that uses mono 44.1kHz.
TBR=tony@chromium.org
Review URL: http://codereview.chromium.org/8574029
TBR=viettrungluu@chromium.org
Review URL: http://codereview.chromium.org/8569003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp')
-rw-r--r-- | ppapi/cpp/dev/audio_input_dev.cc | 44 | ||||
-rw-r--r-- | ppapi/cpp/dev/audio_input_dev.h | 48 |
2 files changed, 0 insertions, 92 deletions
diff --git a/ppapi/cpp/dev/audio_input_dev.cc b/ppapi/cpp/dev/audio_input_dev.cc deleted file mode 100644 index fd81945..0000000 --- a/ppapi/cpp/dev/audio_input_dev.cc +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ppapi/cpp/dev/audio_input_dev.h" - -#include "ppapi/c/dev/ppb_audio_input_dev.h" -#include "ppapi/c/pp_errors.h" -#include "ppapi/cpp/instance.h" -#include "ppapi/cpp/module.h" -#include "ppapi/cpp/module_impl.h" - -namespace pp { - -namespace { - -template <> const char* interface_name<PPB_AudioInput_Dev>() { - return PPB_AUDIO_INPUT_DEV_INTERFACE; -} - -} // namespace - -AudioInput_Dev::AudioInput_Dev(Instance* instance, - const AudioConfig& config, - PPB_AudioInput_Callback callback, - void* user_data) - : config_(config) { - if (has_interface<PPB_AudioInput_Dev>()) { - PassRefFromConstructor(get_interface<PPB_AudioInput_Dev>()->Create( - instance->pp_instance(), config.pp_resource(), callback, user_data)); - } -} - -bool AudioInput_Dev::StartCapture() { - return has_interface<PPB_AudioInput_Dev>() && - get_interface<PPB_AudioInput_Dev>()->StartCapture(pp_resource()); -} - -bool AudioInput_Dev::StopCapture() { - return has_interface<PPB_AudioInput_Dev>() && - get_interface<PPB_AudioInput_Dev>()->StopCapture(pp_resource()); -} - -} // namespace pp diff --git a/ppapi/cpp/dev/audio_input_dev.h b/ppapi/cpp/dev/audio_input_dev.h deleted file mode 100644 index 2a51eb7..0000000 --- a/ppapi/cpp/dev/audio_input_dev.h +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_ -#define PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_ - -#include "ppapi/c/dev/ppb_audio_input_dev.h" -#include "ppapi/cpp/audio_config.h" -#include "ppapi/cpp/resource.h" - -namespace pp { - -class Instance; - -class AudioInput_Dev : public Resource { - public: - /// An empty constructor for an AudioInput resource. - AudioInput_Dev() {} - - AudioInput_Dev(Instance* instance, - const AudioConfig& config, - PPB_AudioInput_Callback callback, - void* user_data); - - /// Getter function for returning the internal <code>PPB_AudioConfig</code> - /// struct. - /// - /// @return A mutable reference to the PPB_AudioConfig struct. - AudioConfig& config() { return config_; } - - /// Getter function for returning the internal <code>PPB_AudioConfig</code> - /// struct. - /// - /// @return A const reference to the internal <code>PPB_AudioConfig</code> - /// struct. - const AudioConfig& config() const { return config_; } - - bool StartCapture(); - bool StopCapture(); - - private: - AudioConfig config_; -}; - -} // namespace pp - -#endif // PPAPI_CPP_DEV_AUDIO_INPUT_DEV_H_ |