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

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

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <X11/XKBlib.h> 5 #include <X11/XKBlib.h>
6 #include <X11/Xlib.h> 6 #include <X11/Xlib.h>
7 #include <signal.h> 7 #include <signal.h>
8 8
9 #include <iostream> // NOLINT 9 #include <iostream> // NOLINT
10 10
(...skipping 19 matching lines...) Expand all
30 #include "media/filters/null_audio_renderer.h" 30 #include "media/filters/null_audio_renderer.h"
31 #include "media/filters/video_renderer_base.h" 31 #include "media/filters/video_renderer_base.h"
32 #include "media/tools/player_x11/data_source_logger.h" 32 #include "media/tools/player_x11/data_source_logger.h"
33 #include "media/tools/player_x11/gl_video_renderer.h" 33 #include "media/tools/player_x11/gl_video_renderer.h"
34 #include "media/tools/player_x11/x11_video_renderer.h" 34 #include "media/tools/player_x11/x11_video_renderer.h"
35 35
36 static Display* g_display = NULL; 36 static Display* g_display = NULL;
37 static Window g_window = 0; 37 static Window g_window = 0;
38 static bool g_running = false; 38 static bool g_running = false;
39 39
40 AudioManager* g_audio_manager = NULL; 40 media::AudioManager* g_audio_manager = NULL;
41 41
42 media::VideoRendererBase* g_video_renderer = NULL; 42 media::VideoRendererBase* g_video_renderer = NULL;
43 43
44 class MessageLoopQuitter { 44 class MessageLoopQuitter {
45 public: 45 public:
46 explicit MessageLoopQuitter(MessageLoop* loop) : loop_(loop) {} 46 explicit MessageLoopQuitter(MessageLoop* loop) : loop_(loop) {}
47 void Quit(media::PipelineStatus status) { 47 void Quit(media::PipelineStatus status) {
48 loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); 48 loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
49 delete this; 49 delete this;
50 } 50 }
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 << " [--audio]" 247 << " [--audio]"
248 << " [--alsa-device=DEVICE]" 248 << " [--alsa-device=DEVICE]"
249 << " [--use-gl]" 249 << " [--use-gl]"
250 << " [--streaming]" << std::endl 250 << " [--streaming]" << std::endl
251 << " Press [ESC] to stop" << std::endl 251 << " Press [ESC] to stop" << std::endl
252 << " Press [SPACE] to toggle pause/play" << std::endl 252 << " Press [SPACE] to toggle pause/play" << std::endl
253 << " Press mouse left button to seek" << std::endl; 253 << " Press mouse left button to seek" << std::endl;
254 return 1; 254 return 1;
255 } 255 }
256 256
257 scoped_ptr<AudioManager> audio_manager(AudioManager::Create()); 257 scoped_ptr<media::AudioManager> audio_manager(media::AudioManager::Create());
258 g_audio_manager = audio_manager.get(); 258 g_audio_manager = audio_manager.get();
259 259
260 logging::InitLogging( 260 logging::InitLogging(
261 NULL, 261 NULL,
262 logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG, 262 logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
263 logging::LOCK_LOG_FILE, // Ignored. 263 logging::LOCK_LOG_FILE, // Ignored.
264 logging::DELETE_OLD_LOG_FILE, // Ignored. 264 logging::DELETE_OLD_LOG_FILE, // Ignored.
265 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); 265 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
266 266
267 // Install the signal handler. 267 // Install the signal handler.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 // Release callback which releases video renderer. Do this before cleaning up 315 // Release callback which releases video renderer. Do this before cleaning up
316 // X below since the video renderer has some X cleanup duties as well. 316 // X below since the video renderer has some X cleanup duties as well.
317 paint_cb.Reset(); 317 paint_cb.Reset();
318 318
319 XDestroyWindow(g_display, g_window); 319 XDestroyWindow(g_display, g_window);
320 XCloseDisplay(g_display); 320 XCloseDisplay(g_display);
321 g_audio_manager = NULL; 321 g_audio_manager = NULL;
322 322
323 return 0; 323 return 0;
324 } 324 }
OLDNEW
« media/audio/audio_output_proxy_unittest.cc ('K') | « media/tools/player_wtl/movie.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698