Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: content/renderer/media/audio_device.cc

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/audio_device.h ('k') | content/renderer/media/audio_device_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_device.cc
diff --git a/content/renderer/media/audio_device.cc b/content/renderer/media/audio_device.cc
index b1e5cdf94c1854f3894d8c080fb9bf1ba0e258a1..60e36a729b91b5450e97548a561f6f976415aa05 100644
--- a/content/renderer/media/audio_device.cc
+++ b/content/renderer/media/audio_device.cc
@@ -23,7 +23,7 @@ using media::AudioRendererSink;
class AudioDevice::AudioThreadCallback
: public AudioDeviceThread::Callback {
public:
- AudioThreadCallback(const AudioParameters& audio_parameters,
+ AudioThreadCallback(const media::AudioParameters& audio_parameters,
base::SharedMemoryHandle memory,
int memory_length,
AudioRendererSink::RenderCallback* render_callback);
@@ -49,7 +49,7 @@ AudioDevice::AudioDevice()
filter_ = RenderThreadImpl::current()->audio_message_filter();
}
-AudioDevice::AudioDevice(const AudioParameters& params,
+AudioDevice::AudioDevice(const media::AudioParameters& params,
RenderCallback* callback)
: ScopedLoopObserver(ChildProcess::current()->io_message_loop()),
audio_parameters_(params),
@@ -61,7 +61,7 @@ AudioDevice::AudioDevice(const AudioParameters& params,
filter_ = RenderThreadImpl::current()->audio_message_filter();
}
-void AudioDevice::Initialize(const AudioParameters& params,
+void AudioDevice::Initialize(const media::AudioParameters& params,
RenderCallback* callback) {
CHECK_EQ(0, stream_id_) <<
"AudioDevice::Initialize() must be called before Start()";
@@ -130,7 +130,7 @@ void AudioDevice::GetVolume(double* volume) {
*volume = volume_;
}
-void AudioDevice::InitializeOnIOThread(const AudioParameters& params) {
+void AudioDevice::InitializeOnIOThread(const media::AudioParameters& params) {
DCHECK(message_loop()->BelongsToCurrentThread());
// Make sure we don't create the stream more than once.
DCHECK_EQ(0, stream_id_);
@@ -262,7 +262,7 @@ void AudioDevice::WillDestroyCurrentMessageLoop() {
// AudioDevice::AudioThreadCallback
AudioDevice::AudioThreadCallback::AudioThreadCallback(
- const AudioParameters& audio_parameters,
+ const media::AudioParameters& audio_parameters,
base::SharedMemoryHandle memory,
int memory_length,
media::AudioRendererSink::RenderCallback* render_callback)
« no previous file with comments | « content/renderer/media/audio_device.h ('k') | content/renderer/media/audio_device_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698