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

Side by Side Diff: chromecast/media/cma/backend/alsa/media_pipeline_backend_alsa.h

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
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 #ifndef CHROMECAST_MEDIA_CMA_BACKEND_ALSA_MEDIA_PIPELINE_BACKEND_ALSA_H_ 5 #ifndef CHROMECAST_MEDIA_CMA_BACKEND_ALSA_MEDIA_PIPELINE_BACKEND_ALSA_H_
6 #define CHROMECAST_MEDIA_CMA_BACKEND_ALSA_MEDIA_PIPELINE_BACKEND_ALSA_H_ 6 #define CHROMECAST_MEDIA_CMA_BACKEND_ALSA_MEDIA_PIPELINE_BACKEND_ALSA_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/time/time.h" 12 #include "base/time/time.h"
12 #include "chromecast/public/media/media_pipeline_backend.h" 13 #include "chromecast/public/media/media_pipeline_backend.h"
13 #include "chromecast/public/media/media_pipeline_device_params.h" 14 #include "chromecast/public/media/media_pipeline_device_params.h"
14 15
15 namespace base { 16 namespace base {
16 class SingleThreadTaskRunner; 17 class SingleThreadTaskRunner;
17 } // namespace base 18 } // namespace base
18 19
19 namespace chromecast { 20 namespace chromecast {
20 namespace media { 21 namespace media {
(...skipping 25 matching lines...) Expand all
46 // State variable for DCHECKing caller correctness. 47 // State variable for DCHECKing caller correctness.
47 enum State { 48 enum State {
48 kStateUninitialized, 49 kStateUninitialized,
49 kStateInitialized, 50 kStateInitialized,
50 kStatePlaying, 51 kStatePlaying,
51 kStatePaused, 52 kStatePaused,
52 }; 53 };
53 State state_; 54 State state_;
54 55
55 const MediaPipelineDeviceParams params_; 56 const MediaPipelineDeviceParams params_;
56 scoped_ptr<VideoDecoderDefault> video_decoder_; 57 std::unique_ptr<VideoDecoderDefault> video_decoder_;
57 scoped_ptr<AudioDecoderAlsa> audio_decoder_; 58 std::unique_ptr<AudioDecoderAlsa> audio_decoder_;
58 59
59 DISALLOW_COPY_AND_ASSIGN(MediaPipelineBackendAlsa); 60 DISALLOW_COPY_AND_ASSIGN(MediaPipelineBackendAlsa);
60 }; 61 };
61 62
62 } // namespace media 63 } // namespace media
63 } // namespace chromecast 64 } // namespace chromecast
64 65
65 #endif // CHROMECAST_MEDIA_CMA_BACKEND_ALSA_MEDIA_PIPELINE_BACKEND_ALSA_H_ 66 #endif // CHROMECAST_MEDIA_CMA_BACKEND_ALSA_MEDIA_PIPELINE_BACKEND_ALSA_H_
OLDNEW
« no previous file with comments | « chromecast/media/cma/backend/alsa/cast_media_shlib.cc ('k') | chromecast/media/cma/backend/alsa/mock_alsa_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698