Construct AudioRendererHost in BrowserRendererProcessHost, also construct

ResourceMessageFilter with pointer to it so we can delegate requests to it from IPC later.

Review URL: http://codereview.chromium.org/20131

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9551 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 44 insertions, 0 deletions

diff --git a/media/audio/audio_output.h b/media/audio/audio_output.h
index b21d653..7d82500 100644
--- a/media/audio/audio_output.h
+++ b/media/audio/audio_output.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_H_
 
+#include "base/basictypes.h"
+
 // Low-level audio output support. To make sound there are 3 objects involved:
 // - AudioSource : produces audio samples on a pull model. Implements
 //   the AudioSourceCallback interface.
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
new file mode 100644
index 0000000..15a13b2
--- /dev/null
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -0,0 +1,10 @@
+// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/audio/audio_output.h"
+
+// TODO(hclam): Do something more useful than returning NULL.
+AudioManager* AudioManager::GetAudioManager() {
+  return NULL;
+}
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
new file mode 100644
index 0000000..15a13b2
--- /dev/null
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -0,0 +1,10 @@
+// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/audio/audio_output.h"
+
+// TODO(hclam): Do something more useful than returning NULL.
+AudioManager* AudioManager::GetAudioManager() {
+  return NULL;
+}
diff --git a/media/media.xcodeproj/project.pbxproj b/media/media.xcodeproj/project.pbxproj
index 488391e..91e425c 100644
--- a/media/media.xcodeproj/project.pbxproj
+++ b/media/media.xcodeproj/project.pbxproj
@@ -46,6 +46,7 @@
 		8200F2030E5F741E005A3C44 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8200F2020E5F741E005A3C44 /* CoreServices.framework */; };
 		820706940EB8D9D4005CD9E7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 820706930EB8D9D4005CD9E7 /* SystemConfiguration.framework */; };
 		82113A280E84360200E3848F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82113A270E84360200E3848F /* Security.framework */; };
+		ABFA33A30F424FBD008FCF5D /* audio_manager_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = ABFA33A20F424FBD008FCF5D /* audio_manager_mac.cc */; };
 		DC5E24F40EFC4CE5006AD1A7 /* data_buffer.cc in Sources */ = {isa = PBXBuildFile; fileRef = DC5E24E10EFC4CC8006AD1A7 /* data_buffer.cc */; };
 		DC5E24F50EFC4CE5006AD1A7 /* media_format.cc in Sources */ = {isa = PBXBuildFile; fileRef = DC5E24E60EFC4CC8006AD1A7 /* media_format.cc */; };
 		DC5E24F60EFC4CF7006AD1A7 /* data_buffer_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = DC5E24E30EFC4CC8006AD1A7 /* data_buffer_unittest.cc */; };
@@ -225,6 +226,7 @@
 		8200F2020E5F741E005A3C44 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = "<group>"; };
 		820706930EB8D9D4005CD9E7 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
 		82113A270E84360200E3848F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = "<group>"; };
+		ABFA33A20F424FBD008FCF5D /* audio_manager_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audio_manager_mac.cc; path = mac/audio_manager_mac.cc; sourceTree = "<group>"; };
 		DC5E24DE0EFC4CC8006AD1A7 /* audio_output.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio_output.h; sourceTree = "<group>"; };
 		DC5E24E00EFC4CC8006AD1A7 /* buffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffers.h; sourceTree = "<group>"; };
 		DC5E24E10EFC4CC8006AD1A7 /* data_buffer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = data_buffer.cc; sourceTree = "<group>"; };
@@ -373,9 +375,18 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		ABFA33980F424FAF008FCF5D /* mac */ = {
+			isa = PBXGroup;
+			children = (
+				ABFA33A20F424FBD008FCF5D /* audio_manager_mac.cc */,
+			);
+			name = mac;
+			sourceTree = "<group>";
+		};
 		DC5E24DD0EFC4CC8006AD1A7 /* audio */ = {
 			isa = PBXGroup;
 			children = (
+				ABFA33980F424FAF008FCF5D /* mac */,
 				DC5E24DE0EFC4CC8006AD1A7 /* audio_output.h */,
 			);
 			path = audio;
@@ -620,6 +631,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ABFA33A30F424FBD008FCF5D /* audio_manager_mac.cc in Sources */,
 				DC5E24F40EFC4CE5006AD1A7 /* data_buffer.cc in Sources */,
 				DC66E6E30F13FE6A00E13554 /* filter_host_impl.cc in Sources */,
 				DC5E24F50EFC4CE5006AD1A7 /* media_format.cc in Sources */,
diff --git a/media/media_lib.scons b/media/media_lib.scons
index 0e017b1..51676b1 100644
--- a/media/media_lib.scons
+++ b/media/media_lib.scons
@@ -56,6 +56,16 @@ input_files = ChromeFileList([
   ]),
 ])
 
+if env.Bit('linux'):
+  input_files.Extend([
+      'audio/linux/audio_manager_linux.cc',
+  ])
+
+if env.Bit('mac'):
+  input_files.Extend([
+      'audio/mac/audio_manager_mac.cc',
+  ])
+
 if not env.Bit('windows'):
   # Windows-specific files.
   input_files.Remove(