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

Side by Side Diff: media/tools/player_wtl/movie.cc

Issue 5682008: Make members of Singleton<T> private and only visible to the singleton type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/tools/player_wtl/movie.h" 5 #include "media/tools/player_wtl/movie.h"
6 6
7 #include "base/singleton.h"
7 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
8 #include "media/base/filter_collection.h" 9 #include "media/base/filter_collection.h"
9 #include "media/base/pipeline_impl.h" 10 #include "media/base/pipeline_impl.h"
10 #include "media/filters/audio_renderer_impl.h" 11 #include "media/filters/audio_renderer_impl.h"
11 #include "media/filters/ffmpeg_audio_decoder.h" 12 #include "media/filters/ffmpeg_audio_decoder.h"
12 #include "media/filters/ffmpeg_demuxer.h" 13 #include "media/filters/ffmpeg_demuxer.h"
13 #include "media/filters/ffmpeg_video_decoder.h" 14 #include "media/filters/ffmpeg_video_decoder.h"
14 #include "media/filters/file_data_source.h" 15 #include "media/filters/file_data_source.h"
15 #include "media/filters/null_audio_renderer.h" 16 #include "media/filters/null_audio_renderer.h"
16 #include "media/tools/player_wtl/wtl_renderer.h" 17 #include "media/tools/player_wtl/wtl_renderer.h"
(...skipping 15 matching lines...) Expand all
32 enable_pause_(false), 33 enable_pause_(false),
33 max_threads_(0), 34 max_threads_(0),
34 play_rate_(1.0f), 35 play_rate_(1.0f),
35 movie_dib_(NULL), 36 movie_dib_(NULL),
36 movie_hwnd_(0) { 37 movie_hwnd_(0) {
37 } 38 }
38 39
39 Movie::~Movie() { 40 Movie::~Movie() {
40 } 41 }
41 42
43 Movie* Movie::GetInstance() {
44 return Singleton<Movie>::get();
45 }
46
42 bool Movie::IsOpen() { 47 bool Movie::IsOpen() {
43 return pipeline_ != NULL; 48 return pipeline_ != NULL;
44 } 49 }
45 50
46 void Movie::SetFrameBuffer(HBITMAP hbmp, HWND hwnd) { 51 void Movie::SetFrameBuffer(HBITMAP hbmp, HWND hwnd) {
47 movie_dib_ = hbmp; 52 movie_dib_ = hbmp;
48 movie_hwnd_ = hwnd; 53 movie_hwnd_ = hwnd;
49 } 54 }
50 55
51 bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) { 56 bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 void Movie::Close() { 167 void Movie::Close() {
163 if (pipeline_) { 168 if (pipeline_) {
164 pipeline_->Stop(NULL); 169 pipeline_->Stop(NULL);
165 thread_->Stop(); 170 thread_->Stop();
166 pipeline_ = NULL; 171 pipeline_ = NULL;
167 thread_.reset(); 172 thread_.reset();
168 } 173 }
169 } 174 }
170 175
171 } // namespace media 176 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698