summaryrefslogtreecommitdiffstats
path: root/media/audio
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-07 16:10:47 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-07 16:10:47 +0000
commit9ec0f9c97357dd5b4dd9deae252f8d3633ad38a9 (patch)
tree061c0b2fb922a0e0f710d8399c6f45cbd5f2e8df /media/audio
parent93a99125d4826e560c9a51603279eae9a7390694 (diff)
downloadchromium_src-9ec0f9c97357dd5b4dd9deae252f8d3633ad38a9.zip
chromium_src-9ec0f9c97357dd5b4dd9deae252f8d3633ad38a9.tar.gz
chromium_src-9ec0f9c97357dd5b4dd9deae252f8d3633ad38a9.tar.bz2
Rewrite scoped_array<T> to scoped_ptr<T[]> in media/ and webkit/.
This changelist was automatically generated using a clang tool. BUG=171111 Review URL: https://codereview.chromium.org/13752002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
-rw-r--r--media/audio/audio_low_latency_input_output_unittest.cc2
-rw-r--r--media/audio/cross_process_notification_posix.cc2
-rw-r--r--media/audio/fake_audio_input_stream.h2
-rw-r--r--media/audio/linux/alsa_input.h2
-rw-r--r--media/audio/pulse/pulse_input.h2
-rw-r--r--media/audio/pulse/pulse_unified.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 64dc254..27f4873 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -275,7 +275,7 @@ class FullDuplexAudioSinkSource
int channels_;
int frame_size_;
double frames_to_ms_;
- scoped_array<AudioDelayState> delay_states_;
+ scoped_ptr<AudioDelayState[]> delay_states_;
size_t input_elements_to_write_;
size_t output_elements_to_write_;
base::Time previous_write_time_;
diff --git a/media/audio/cross_process_notification_posix.cc b/media/audio/cross_process_notification_posix.cc
index 070ef06..d568349 100644
--- a/media/audio/cross_process_notification_posix.cc
+++ b/media/audio/cross_process_notification_posix.cc
@@ -80,7 +80,7 @@ int CrossProcessNotification::WaitMultiple(const Notifications& notifications,
// variable to split up the array so that the last socket to be signaled
// becomes the last socket in the array and all the other sockets will have
// priority the next time WaitMultiple is called.
- scoped_array<struct pollfd> sockets(new struct pollfd[notifications.size()]);
+ scoped_ptr<struct pollfd[]> sockets(new struct pollfd[notifications.size()]);
memset(&sockets[0], 0, notifications.size() * sizeof(sockets[0]));
size_t index = 0;
for (size_t i = wait_offset; i < notifications.size(); ++i) {
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index c1e1ba5..169405b 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -57,7 +57,7 @@ class MEDIA_EXPORT FakeAudioInputStream
AudioManagerBase* audio_manager_;
AudioInputCallback* callback_;
- scoped_array<uint8> buffer_;
+ scoped_ptr<uint8[]> buffer_;
int buffer_size_;
AudioParameters params_;
base::Thread thread_;
diff --git a/media/audio/linux/alsa_input.h b/media/audio/linux/alsa_input.h
index f7461da..df2b471 100644
--- a/media/audio/linux/alsa_input.h
+++ b/media/audio/linux/alsa_input.h
@@ -81,7 +81,7 @@ class AlsaPcmInputStream : public AudioInputStreamImpl {
snd_mixer_t* mixer_handle_; // Handle to the ALSA microphone mixer.
snd_mixer_elem_t* mixer_element_handle_; // Handle to the capture element.
base::WeakPtrFactory<AlsaPcmInputStream> weak_factory_;
- scoped_array<uint8> audio_buffer_; // Buffer used for reading audio data.
+ scoped_ptr<uint8[]> audio_buffer_; // Buffer used for reading audio data.
bool read_callback_behind_schedule_;
DISALLOW_COPY_AND_ASSIGN(AlsaPcmInputStream);
diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h
index e7e1263..00bc03f 100644
--- a/media/audio/pulse/pulse_input.h
+++ b/media/audio/pulse/pulse_input.h
@@ -65,7 +65,7 @@ class PulseAudioInputStream : public AudioInputStreamImpl {
// Temporary storage for recorded data. It gets a packet of data from
// |buffer_| and deliver the data to OnData() callback.
- scoped_array<uint8> audio_data_buffer_;
+ scoped_ptr<uint8[]> audio_data_buffer_;
// PulseAudio API structs.
pa_threaded_mainloop* pa_mainloop_; // Weak.
diff --git a/media/audio/pulse/pulse_unified.h b/media/audio/pulse/pulse_unified.h
index 0d52a13..d7476a8 100644
--- a/media/audio/pulse/pulse_unified.h
+++ b/media/audio/pulse/pulse_unified.h
@@ -75,7 +75,7 @@ class PulseAudioUnifiedStream : public AudioOutputStream {
// Temporary storage for recorded data. It gets a packet of data from
// |fifo_| and deliver the data to OnMoreIOData() callback.
- scoped_array<uint8> input_data_buffer_;
+ scoped_ptr<uint8[]> input_data_buffer_;
DISALLOW_COPY_AND_ASSIGN(PulseAudioUnifiedStream);
};