| Index: ppapi/cpp/audio_config.cc
|
| diff --git a/ppapi/cpp/audio_config.cc b/ppapi/cpp/audio_config.cc
|
| index a49515e49b308ddfdf58f7ab73ed82bf0bed4b44..ef03922c05c8123580a58a3e89780b18a4a561df 100644
|
| --- a/ppapi/cpp/audio_config.cc
|
| +++ b/ppapi/cpp/audio_config.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "ppapi/cpp/audio_config.h"
|
|
|
| -#include "ppapi/cpp/instance.h"
|
| +#include "ppapi/cpp/instance_handle.h"
|
| #include "ppapi/cpp/module.h"
|
| #include "ppapi/cpp/module_impl.h"
|
|
|
| @@ -23,7 +23,7 @@ AudioConfig::AudioConfig()
|
| sample_frame_count_(0) {
|
| }
|
|
|
| -AudioConfig::AudioConfig(Instance* instance,
|
| +AudioConfig::AudioConfig(const InstanceHandle& instance,
|
| PP_AudioSampleRate sample_rate,
|
| uint32_t sample_frame_count)
|
| : sample_rate_(sample_rate),
|
| @@ -31,27 +31,28 @@ AudioConfig::AudioConfig(Instance* instance,
|
| if (has_interface<PPB_AudioConfig>()) {
|
| PassRefFromConstructor(
|
| get_interface<PPB_AudioConfig>()->CreateStereo16Bit(
|
| - instance->pp_instance(), sample_rate, sample_frame_count));
|
| + instance.pp_instance(), sample_rate, sample_frame_count));
|
| }
|
| }
|
|
|
| // static
|
| -PP_AudioSampleRate AudioConfig::RecommendSampleRate(Instance* instance) {
|
| +PP_AudioSampleRate AudioConfig::RecommendSampleRate(
|
| + const InstanceHandle& instance) {
|
| if (!has_interface<PPB_AudioConfig>())
|
| return PP_AUDIOSAMPLERATE_NONE;
|
| return get_interface<PPB_AudioConfig>()->
|
| - RecommendSampleRate(instance->pp_instance());
|
| + RecommendSampleRate(instance.pp_instance());
|
| }
|
|
|
| // static
|
| uint32_t AudioConfig::RecommendSampleFrameCount(
|
| - Instance* instance,
|
| + const InstanceHandle& instance,
|
| PP_AudioSampleRate sample_rate,
|
| uint32_t requested_sample_frame_count) {
|
| if (!has_interface<PPB_AudioConfig>())
|
| return 0;
|
| return get_interface<PPB_AudioConfig>()->
|
| - RecommendSampleFrameCount(instance->pp_instance(),
|
| + RecommendSampleFrameCount(instance.pp_instance(),
|
| sample_rate,
|
| requested_sample_frame_count);
|
| }
|
|
|