Fix clang compile errors in Web Audio

https://bugs.webkit.org/show_bug.cgi?id=68384

Reviewed by David Levin.

No new tests; no net change in functionality.

* platform/graphics/MediaPlayer.h: Forward declare (instead of including directly)
    AudioSourceProvider.
* webaudio/AudioChannelMerger.cpp:
(WebCore::AudioChannelMerger::checkNumberOfChannelsForInput): Remove unused parameter name.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95586 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c852014..d7f2223 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-09-19  Jer Noble  <jer.noble@apple.com>
+
+        Fix clang compile errors in Web Audio
+        https://bugs.webkit.org/show_bug.cgi?id=68384
+
+        Reviewed by David Levin.
+
+        No new tests; no net change in functionality.
+
+        * platform/graphics/MediaPlayer.h: Forward declare (instead of including directly)
+            AudioSourceProvider.
+        * webaudio/AudioChannelMerger.cpp:
+        (WebCore::AudioChannelMerger::checkNumberOfChannelsForInput): Remove unused parameter name.
+
 2011-09-20  John Gregg  <johnnyg@google.com>
 
         Directory Upload: parent path can truncate first char of the correct path

diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h
index d6ae421..c26607e 100644 (file)
--- a/Source/WebCore/platform/graphics/MediaPlayer.h
+++ b/Source/WebCore/platform/graphics/MediaPlayer.h
@@ -41,10 +41,6 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/StringHash.h>
 
-#if ENABLE(WEB_AUDIO)
-#include "AudioSourceProvider.h"
-#endif
-
 #if USE(ACCELERATED_COMPOSITING)
 #include "GraphicsLayer.h"
 #endif
@@ -62,6 +58,7 @@ class QTMovieVisualContext;
 
 namespace WebCore {
 
+class AudioSourceProvider;
 class GStreamerGWorld;
 class MediaPlayerPrivateInterface;
 

diff --git a/Source/WebCore/webaudio/AudioChannelMerger.cpp b/Source/WebCore/webaudio/AudioChannelMerger.cpp
index eb5b80c..40a6386 100644 (file)
--- a/Source/WebCore/webaudio/AudioChannelMerger.cpp
+++ b/Source/WebCore/webaudio/AudioChannelMerger.cpp
@@ -89,7 +89,7 @@ void AudioChannelMerger::reset()
 
 // Any time a connection or disconnection happens on any of our inputs, we potentially need to change the
 // number of channels of our output.
-void AudioChannelMerger::checkNumberOfChannelsForInput(AudioNodeInput* input)
+void AudioChannelMerger::checkNumberOfChannelsForInput(AudioNodeInput*)
 {
     ASSERT(context()->isAudioThread() && context()->isGraphOwner());