diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:30:45 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:30:45 +0000 |
| commit | 897bfb5aaaa57f0338a77fada1d5d3f9c3b38226 (patch) | |
| tree | fddba9cf19f4258a0b36a3fae5e27f2422cd277e /content/common/media | |
| parent | 103f19fbcf7d78efd8edc28bfabb3d4915a246de (diff) | |
| download | chromium_src-897bfb5aaaa57f0338a77fada1d5d3f9c3b38226.zip chromium_src-897bfb5aaaa57f0338a77fada1d5d3f9c3b38226.tar.gz chromium_src-897bfb5aaaa57f0338a77fada1d5d3f9c3b38226.tar.bz2 | |
Move media/audio files into media namespace
BUG=115187
TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests
Review URL: https://chromiumcodereview.appspot.com/9805001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/media')
| -rw-r--r-- | content/common/media/audio_messages.h | 6 | ||||
| -rw-r--r-- | content/common/media/audio_param_traits.cc | 2 | ||||
| -rw-r--r-- | content/common/media/audio_param_traits.h | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/content/common/media/audio_messages.h b/content/common/media/audio_messages.h index 0acb35c..ce0d4bd 100644 --- a/content/common/media/audio_messages.h +++ b/content/common/media/audio_messages.h @@ -23,7 +23,7 @@ IPC_ENUM_TRAITS(AudioStreamState) -IPC_STRUCT_TRAITS_BEGIN(AudioBuffersState) +IPC_STRUCT_TRAITS_BEGIN(media::AudioBuffersState) IPC_STRUCT_TRAITS_MEMBER(pending_bytes) IPC_STRUCT_TRAITS_MEMBER(hardware_delay_bytes) IPC_STRUCT_TRAITS_END() @@ -90,12 +90,12 @@ IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyDeviceStarted, // Request that got sent to browser for creating an audio output stream IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream, int /* stream_id */, - AudioParameters /* params */) + media::AudioParameters /* params */) // Request that got sent to browser for creating an audio input stream IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream, int /* stream_id */, - AudioParameters /* params */, + media::AudioParameters /* params */, std::string /* device_id */, bool /* automatic_gain_control */) diff --git a/content/common/media/audio_param_traits.cc b/content/common/media/audio_param_traits.cc index 049037f..7092540 100644 --- a/content/common/media/audio_param_traits.cc +++ b/content/common/media/audio_param_traits.cc @@ -7,6 +7,8 @@ #include "base/stringprintf.h" #include "media/audio/audio_parameters.h" +using media::AudioParameters; + namespace IPC { void ParamTraits<AudioParameters>::Write(Message* m, diff --git a/content/common/media/audio_param_traits.h b/content/common/media/audio_param_traits.h index 13c1139..578f9a3 100644 --- a/content/common/media/audio_param_traits.h +++ b/content/common/media/audio_param_traits.h @@ -9,13 +9,15 @@ #include "ipc/ipc_message.h" #include "ipc/ipc_param_traits.h" +namespace media { class AudioParameters; +} namespace IPC { template <> -struct ParamTraits<AudioParameters> { - typedef AudioParameters param_type; +struct ParamTraits<media::AudioParameters> { + typedef media::AudioParameters param_type; static void Write(Message* m, const param_type& p); static bool Read(const Message* m, PickleIterator* iter, param_type* r); static void Log(const param_type& p, std::string* l); |