media/tools/player_x11/player_x11.cc - Issue 9805001: Move media/audio files into media namespace

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

Unified 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:

Index: media/tools/player_x11/player_x11.cc

diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc

index 8da75deb65f835f471350ff15a65083d77f57c38..3363cd2bf656b13079a56b37757532ac8965f357 100644

--- a/media/tools/player_x11/player_x11.cc

+++ b/media/tools/player_x11/player_x11.cc

@@ -37,7 +37,7 @@ static Display* g_display = NULL;

static Window g_window = 0;

static bool g_running = false;

-AudioManager* g_audio_manager = NULL;

+media::AudioManager* g_audio_manager = NULL;

media::VideoRendererBase* g_video_renderer = NULL;

@@ -254,7 +254,7 @@ int main(int argc, char** argv) {

return 1;

}

- scoped_ptr<AudioManager> audio_manager(AudioManager::Create());

+ scoped_ptr<media::AudioManager> audio_manager(media::AudioManager::Create());

g_audio_manager = audio_manager.get();

logging::InitLogging(