OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ | 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ |
6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ | 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ |
7 | 7 |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
71 scoped_ptr<MojoDemuxerStreamAdapter> stream_; | 71 scoped_ptr<MojoDemuxerStreamAdapter> stream_; |
72 scoped_ptr<AudioRenderer> audio_renderer_; | 72 scoped_ptr<AudioRenderer> audio_renderer_; |
73 | 73 |
74 mojo::Callback<void()> init_cb_; | 74 mojo::Callback<void()> init_cb_; |
75 | 75 |
76 // TODO(tim): Figure out how to set up hardware config. | 76 // TODO(tim): Figure out how to set up hardware config. |
77 // NOTE: AudioRendererImpl stores a const& to the config we pass in (hmm..). | 77 // NOTE: AudioRendererImpl stores a const& to the config we pass in (hmm..). |
78 // Hence stack-allocating one and passing it to Initialize results in | 78 // Hence stack-allocating one and passing it to Initialize results in |
79 // undefined badness (e.g, hangs trying to acquire config_lock_); | 79 // undefined badness (e.g, hangs trying to acquire config_lock_); |
80 media::AudioHardwareConfig hardware_config_; | 80 media::AudioHardwareConfig hardware_config_; |
81 base::WeakPtr<MojoRendererService> weak_this_; | |
82 base::WeakPtrFactory<MojoRendererService> weak_factory_; | |
xhwang
2014/09/29 16:34:02
ditto
| |
81 | 83 |
82 base::WeakPtrFactory<MojoRendererService> weak_factory_; | |
83 base::WeakPtr<MojoRendererService> weak_this_; | |
84 DISALLOW_COPY_AND_ASSIGN(MojoRendererService); | 84 DISALLOW_COPY_AND_ASSIGN(MojoRendererService); |
85 }; | 85 }; |
86 | 86 |
87 } // namespace media | 87 } // namespace media |
88 | 88 |
89 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ | 89 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ |
OLD | NEW |