| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chromecast/media/audio/cast_audio_manager_factory.h" | 5 #include "chromecast/media/audio/cast_audio_manager_factory.h" |
| 6 | 6 |
| 7 #include "chromecast/media/audio/cast_audio_manager.h" | 7 #include "chromecast/media/audio/cast_audio_manager.h" |
| 8 #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h" | 8 #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h" |
| 9 | 9 |
| 10 namespace chromecast { | 10 namespace chromecast { |
| 11 namespace media { | 11 namespace media { |
| 12 | 12 |
| 13 CastAudioManagerFactory::CastAudioManagerFactory( | 13 CastAudioManagerFactory::CastAudioManagerFactory( |
| 14 MediaPipelineBackendManager* backend_manager) | 14 MediaPipelineBackendManager* backend_manager) |
| 15 : backend_manager_(backend_manager) { | 15 : backend_manager_(backend_manager) { |
| 16 } | 16 } |
| 17 | 17 |
| 18 CastAudioManagerFactory::~CastAudioManagerFactory() {} | 18 CastAudioManagerFactory::~CastAudioManagerFactory() {} |
| 19 | 19 |
| 20 ::media::AudioManager* CastAudioManagerFactory::CreateInstance( | 20 scoped_ptr<::media::AudioManager, ::media::AudioManagerDeleter> |
| 21 CastAudioManagerFactory::CreateInstance( |
| 22 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 23 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, |
| 21 ::media::AudioLogFactory* audio_log_factory) { | 24 ::media::AudioLogFactory* audio_log_factory) { |
| 22 return new CastAudioManager(audio_log_factory, backend_manager_); | 25 return scoped_ptr<::media::AudioManager, ::media::AudioManagerDeleter>( |
| 26 new CastAudioManager(std::move(task_runner), |
| 27 std::move(worker_task_runner), audio_log_factory, |
| 28 backend_manager_)); |
| 23 } | 29 } |
| 24 | 30 |
| 25 } // namespace media | 31 } // namespace media |
| 26 } // namespace chromecast | 32 } // namespace chromecast |
| OLD | NEW |