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

Unified Diff: media/tools/player_x11/player_x11.cc

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/player_x11/player_x11.cc
===================================================================
--- media/tools/player_x11/player_x11.cc (revision 130181)
+++ media/tools/player_x11/player_x11.cc (working copy)
@@ -37,7 +37,7 @@
static Window g_window = 0;
static bool g_running = false;
-media::AudioManager* g_audio_manager = NULL;
+AudioManager* g_audio_manager = NULL;
media::VideoRendererBase* g_video_renderer = NULL;
@@ -238,7 +238,7 @@
return 1;
}
- scoped_ptr<media::AudioManager> audio_manager(media::AudioManager::Create());
+ scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
g_audio_manager = audio_manager.get();
logging::InitLogging(
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698