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

Side by Side Diff: media/audio/audio_output_proxy.cc

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/audio/audio_output_proxy.h" 5 #include "media/audio/audio_output_proxy.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "media/audio/audio_manager.h" 9 #include "media/audio/audio_manager.h"
10 #include "media/audio/audio_output_dispatcher.h" 10 #include "media/audio/audio_output_dispatcher.h"
11 11
12 namespace media {
13
12 AudioOutputProxy::AudioOutputProxy(AudioOutputDispatcher* dispatcher) 14 AudioOutputProxy::AudioOutputProxy(AudioOutputDispatcher* dispatcher)
13 : dispatcher_(dispatcher), 15 : dispatcher_(dispatcher),
14 state_(kCreated), 16 state_(kCreated),
15 physical_stream_(NULL), 17 physical_stream_(NULL),
16 volume_(1.0) { 18 volume_(1.0) {
17 } 19 }
18 20
19 AudioOutputProxy::~AudioOutputProxy() { 21 AudioOutputProxy::~AudioOutputProxy() {
20 DCHECK(CalledOnValidThread()); 22 DCHECK(CalledOnValidThread());
21 DCHECK(state_ == kCreated || state_ == kClosed); 23 DCHECK(state_ == kCreated || state_ == kClosed);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 dispatcher_->StreamClosed(); 88 dispatcher_->StreamClosed();
87 89
88 state_ = kClosed; 90 state_ = kClosed;
89 91
90 // Delete the object now like is done in the Close() implementation of 92 // Delete the object now like is done in the Close() implementation of
91 // physical stream objects. If we delete the object via DeleteSoon, we 93 // physical stream objects. If we delete the object via DeleteSoon, we
92 // unnecessarily complicate the Shutdown procedure of the 94 // unnecessarily complicate the Shutdown procedure of the
93 // dispatcher+audio manager. 95 // dispatcher+audio manager.
94 delete this; 96 delete this;
95 } 97 }
98
99 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698