media/tools/player_wtl/movie.cc - Issue 830002: win: string_util.h -> utf_string_conversions.h fix.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)

Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 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

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this	1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this

2 // source code is governed by a BSD-style license that can be found in the	2 // source code is governed by a BSD-style license that can be found in the

3 // LICENSE file.	3 // 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/string_util.h"	7 #include "base/utf_string_conversions.h"

8 #include "media/base/pipeline_impl.h"	8 #include "media/base/pipeline_impl.h"

9 #include "media/filters/audio_renderer_impl.h"	9 #include "media/filters/audio_renderer_impl.h"

10 #include "media/filters/ffmpeg_audio_decoder.h"	10 #include "media/filters/ffmpeg_audio_decoder.h"

11 #include "media/filters/ffmpeg_demuxer.h"	11 #include "media/filters/ffmpeg_demuxer.h"

12 #include "media/filters/ffmpeg_video_decoder.h"	12 #include "media/filters/ffmpeg_video_decoder.h"

13 #include "media/filters/file_data_source.h"	13 #include "media/filters/file_data_source.h"

14 #include "media/filters/null_audio_renderer.h"	14 #include "media/filters/null_audio_renderer.h"

15 #include "media/tools/player_wtl/wtl_renderer.h"	15 #include "media/tools/player_wtl/wtl_renderer.h"

16	16

17 using media::AudioRendererImpl;	17 using media::AudioRendererImpl;

(...skipping 145 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
163 void Movie::Close() {	163 void Movie::Close() {

164 if (pipeline_) {	164 if (pipeline_) {

165 pipeline_->Stop(NULL);	165 pipeline_->Stop(NULL);

166 thread_->Stop();	166 thread_->Stop();

167 pipeline_ = NULL;	167 pipeline_ = NULL;

168 thread_.reset();	168 thread_.reset();

169 }	169 }

170 }	170 }

171	171

172 } // namespace media	172 } // namespace media

OLD	NEW

« no previous file with comments | « media/filters/file_data_source_unittest.cc ('k') | net/base/mime_util.cc » ('j') | no next file with comments »