| Index: ppapi/cpp/audio_buffer.cc
|
| diff --git a/ppapi/cpp/audio_frame.cc b/ppapi/cpp/audio_buffer.cc
|
| similarity index 21%
|
| rename from ppapi/cpp/audio_frame.cc
|
| rename to ppapi/cpp/audio_buffer.cc
|
| index feb038ac9a35496e5cd7d4556590e201146154ef..e1952c2260667e22f97b27c26e875220028f990b 100644
|
| --- a/ppapi/cpp/audio_frame.cc
|
| +++ b/ppapi/cpp/audio_buffer.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ppapi/cpp/audio_frame.h"
|
| +#include "ppapi/cpp/audio_buffer.h"
|
|
|
| #include "ppapi/cpp/module.h"
|
| #include "ppapi/cpp/module_impl.h"
|
| @@ -11,76 +11,78 @@ namespace pp {
|
|
|
| namespace {
|
|
|
| -template <> const char* interface_name<PPB_AudioFrame_0_1>() {
|
| - return PPB_AUDIOFRAME_INTERFACE_0_1;
|
| +template <> const char* interface_name<PPB_AudioBuffer_0_1>() {
|
| + return PPB_AUDIOBUFFER_INTERFACE_0_1;
|
| }
|
|
|
| } // namespace
|
|
|
| -AudioFrame::AudioFrame() {
|
| +AudioBuffer::AudioBuffer() {
|
| }
|
|
|
| -AudioFrame::AudioFrame(const AudioFrame& other) : Resource(other) {
|
| +AudioBuffer::AudioBuffer(const AudioBuffer& other) : Resource(other) {
|
| }
|
|
|
| -AudioFrame::AudioFrame(const Resource& resource) : Resource(resource) {
|
| +AudioBuffer::AudioBuffer(const Resource& resource) : Resource(resource) {
|
| }
|
|
|
| -AudioFrame::AudioFrame(PassRef, PP_Resource resource)
|
| +AudioBuffer::AudioBuffer(PassRef, PP_Resource resource)
|
| : Resource(PASS_REF, resource) {
|
| }
|
|
|
| -AudioFrame::~AudioFrame() {
|
| +AudioBuffer::~AudioBuffer() {
|
| }
|
|
|
| -PP_TimeDelta AudioFrame::GetTimestamp() const {
|
| - if (has_interface<PPB_AudioFrame_0_1>())
|
| - return get_interface<PPB_AudioFrame_0_1>()->GetTimestamp(pp_resource());
|
| +PP_TimeDelta AudioBuffer::GetTimestamp() const {
|
| + if (has_interface<PPB_AudioBuffer_0_1>())
|
| + return get_interface<PPB_AudioBuffer_0_1>()->GetTimestamp(pp_resource());
|
| return 0.0;
|
| }
|
|
|
| -void AudioFrame::SetTimestamp(PP_TimeDelta timestamp) {
|
| - if (has_interface<PPB_AudioFrame_0_1>())
|
| - get_interface<PPB_AudioFrame_0_1>()->SetTimestamp(pp_resource(), timestamp);
|
| +void AudioBuffer::SetTimestamp(PP_TimeDelta timestamp) {
|
| + if (has_interface<PPB_AudioBuffer_0_1>()) {
|
| + get_interface<PPB_AudioBuffer_0_1>()->SetTimestamp(pp_resource(),
|
| + timestamp);
|
| + }
|
| }
|
|
|
| -PP_AudioFrame_SampleRate AudioFrame::GetSampleRate() const {
|
| - if (has_interface<PPB_AudioFrame_0_1>())
|
| - return get_interface<PPB_AudioFrame_0_1>()->GetSampleRate(pp_resource());
|
| - return PP_AUDIOFRAME_SAMPLERATE_UNKNOWN;
|
| +PP_AudioBuffer_SampleRate AudioBuffer::GetSampleRate() const {
|
| + if (has_interface<PPB_AudioBuffer_0_1>())
|
| + return get_interface<PPB_AudioBuffer_0_1>()->GetSampleRate(pp_resource());
|
| + return PP_AUDIOBUFFER_SAMPLERATE_UNKNOWN;
|
| }
|
|
|
| -PP_AudioFrame_SampleSize AudioFrame::GetSampleSize() const {
|
| - if (has_interface<PPB_AudioFrame_0_1>())
|
| - return get_interface<PPB_AudioFrame_0_1>()->GetSampleSize(pp_resource());
|
| - return PP_AUDIOFRAME_SAMPLESIZE_UNKNOWN;
|
| +PP_AudioBuffer_SampleSize AudioBuffer::GetSampleSize() const {
|
| + if (has_interface<PPB_AudioBuffer_0_1>())
|
| + return get_interface<PPB_AudioBuffer_0_1>()->GetSampleSize(pp_resource());
|
| + return PP_AUDIOBUFFER_SAMPLESIZE_UNKNOWN;
|
| }
|
|
|
| -uint32_t AudioFrame::GetNumberOfChannels() const {
|
| - if (has_interface<PPB_AudioFrame_0_1>()) {
|
| - return get_interface<PPB_AudioFrame_0_1>()->GetNumberOfChannels(
|
| +uint32_t AudioBuffer::GetNumberOfChannels() const {
|
| + if (has_interface<PPB_AudioBuffer_0_1>()) {
|
| + return get_interface<PPB_AudioBuffer_0_1>()->GetNumberOfChannels(
|
| pp_resource());
|
| }
|
| return 0;
|
| }
|
|
|
| -uint32_t AudioFrame::GetNumberOfSamples() const {
|
| - if (has_interface<PPB_AudioFrame_0_1>()) {
|
| - return get_interface<PPB_AudioFrame_0_1>()->GetNumberOfSamples(
|
| +uint32_t AudioBuffer::GetNumberOfSamples() const {
|
| + if (has_interface<PPB_AudioBuffer_0_1>()) {
|
| + return get_interface<PPB_AudioBuffer_0_1>()->GetNumberOfSamples(
|
| pp_resource());
|
| }
|
| return 0;
|
| }
|
|
|
| -void* AudioFrame::GetDataBuffer() {
|
| - if (has_interface<PPB_AudioFrame_0_1>())
|
| - return get_interface<PPB_AudioFrame_0_1>()->GetDataBuffer(pp_resource());
|
| +void* AudioBuffer::GetDataBuffer() {
|
| + if (has_interface<PPB_AudioBuffer_0_1>())
|
| + return get_interface<PPB_AudioBuffer_0_1>()->GetDataBuffer(pp_resource());
|
| return NULL;
|
| }
|
|
|
| -uint32_t AudioFrame::GetDataBufferSize() const {
|
| - if (has_interface<PPB_AudioFrame_0_1>()) {
|
| - return get_interface<PPB_AudioFrame_0_1>()->GetDataBufferSize(
|
| +uint32_t AudioBuffer::GetDataBufferSize() const {
|
| + if (has_interface<PPB_AudioBuffer_0_1>()) {
|
| + return get_interface<PPB_AudioBuffer_0_1>()->GetDataBufferSize(
|
| pp_resource());
|
| }
|
| return 0;
|
|
|