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

Side by Side Diff: media/tools/player_x11/player_x11.cc

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « media/tools/player_wtl/movie.h ('k') | net/base/directory_lister.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <iostream> 5 #include <iostream>
6 #include <signal.h> 6 #include <signal.h>
7 #include <X11/keysym.h> 7 #include <X11/keysym.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
14 #include "base/thread.h" 14 #include "base/threading/thread.h"
15 #include "media/base/callback.h" 15 #include "media/base/callback.h"
16 #include "media/base/filter_collection.h" 16 #include "media/base/filter_collection.h"
17 #include "media/base/media.h" 17 #include "media/base/media.h"
18 #include "media/base/media_switches.h" 18 #include "media/base/media_switches.h"
19 #include "media/base/pipeline_impl.h" 19 #include "media/base/pipeline_impl.h"
20 #include "media/filters/audio_renderer_impl.h" 20 #include "media/filters/audio_renderer_impl.h"
21 #include "media/filters/ffmpeg_audio_decoder.h" 21 #include "media/filters/ffmpeg_audio_decoder.h"
22 #include "media/filters/ffmpeg_demuxer.h" 22 #include "media/filters/ffmpeg_demuxer.h"
23 #include "media/filters/ffmpeg_video_decoder.h" 23 #include "media/filters/ffmpeg_video_decoder.h"
24 #include "media/filters/file_data_source.h" 24 #include "media/filters/file_data_source.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 } else{ 263 } else{
264 std::cout << "Pipeline initialization failed..." << std::endl; 264 std::cout << "Pipeline initialization failed..." << std::endl;
265 } 265 }
266 266
267 // Cleanup tasks. 267 // Cleanup tasks.
268 thread->Stop(); 268 thread->Stop();
269 XDestroyWindow(g_display, g_window); 269 XDestroyWindow(g_display, g_window);
270 XCloseDisplay(g_display); 270 XCloseDisplay(g_display);
271 return 0; 271 return 0;
272 } 272 }
OLDNEW
« no previous file with comments | « media/tools/player_wtl/movie.h ('k') | net/base/directory_lister.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698