Bug 805254. Part 5: Remove format parameter from PAudio constructor. r=kinetik

content/media/nsAudioStream.cpp

@@ -132,8 +132,7 @@ class AudioInitEvent : public nsRunnable
     ContentChild * cpc = ContentChild::GetSingleton();
     NS_ASSERTION(cpc, "Content Protocol is NULL!");
     mOwner->mAudioChild =  static_cast<AudioChild*>(cpc->SendPAudioConstructor(mOwner->mChannels,
-                                                                               mOwner->mRate,
-                                                                               Format()));
+                                                                               mOwner->mRate));
     return NS_OK;
   }
 

dom/ipc/AudioParent.cpp

@@ -292,7 +292,7 @@ AudioParent::SendWriteDone()
   return true;
 }
 
-AudioParent::AudioParent(int32_t aNumChannels, int32_t aRate, int32_t aFormat)
+AudioParent::AudioParent(int32_t aNumChannels, int32_t aRate)
   : mIPCOpen(true)
 {
   mStream = nsAudioStream::AllocateStream();

dom/ipc/AudioParent.h

@@ -50,7 +50,7 @@ class AudioParent : public PAudioParent, public nsITimerCallback
     virtual bool
     SendWriteDone();
 
-    AudioParent(int32_t aNumChannels, int32_t aRate, int32_t aFormat);
+    AudioParent(int32_t aNumChannels, int32_t aRate);
     virtual ~AudioParent();
     virtual void ActorDestroy(ActorDestroyReason);
 

dom/ipc/ContentChild.cpp

@@ -655,8 +655,7 @@ ContentChild::RecvPTestShellConstructor(PTestShellChild* actor)
 
 PAudioChild*
 ContentChild::AllocPAudio(const int32_t& numChannels,
-                          const int32_t& rate,
-                          const int32_t& format)
+                          const int32_t& rate)
 {
 #if defined(MOZ_SYDNEYAUDIO)
     AudioChild *child = new AudioChild();

dom/ipc/ContentChild.h

@@ -123,7 +123,6 @@ public:
     virtual bool RecvPTestShellConstructor(PTestShellChild*);
 
     virtual PAudioChild* AllocPAudio(const int32_t&,
-                                     const int32_t&,
                                      const int32_t&);
     virtual bool DeallocPAudio(PAudioChild*);
 

dom/ipc/ContentParent.cpp

@@ -1438,11 +1438,10 @@ ContentParent::DeallocPTestShell(PTestShellParent* shell)
  
 PAudioParent*
 ContentParent::AllocPAudio(const int32_t& numChannels,
-                           const int32_t& rate,
-                           const int32_t& format)
+                           const int32_t& rate)
 {
 #if defined(MOZ_SYDNEYAUDIO)
-    AudioParent *parent = new AudioParent(numChannels, rate, format);
+    AudioParent *parent = new AudioParent(numChannels, rate);
     NS_ADDREF(parent);
     return parent;
 #else

dom/ipc/ContentParent.h

@@ -222,7 +222,6 @@ private:
     virtual bool DeallocPTestShell(PTestShellParent* shell);
 
     virtual PAudioParent* AllocPAudio(const int32_t&,
-                                     const int32_t&,
                                      const int32_t&);
     virtual bool DeallocPAudio(PAudioParent*);
 

dom/ipc/PContent.ipdl

@@ -272,7 +272,7 @@ parent:
         returns (uint64_t id, bool startBackground,
                  bool isForApp, bool isForBrowser);
 
-    PAudio(int32_t aNumChannels, int32_t aRate, int32_t aFormat);
+    PAudio(int32_t aNumChannels, int32_t aRate);
 
     PDeviceStorageRequest(DeviceStorageParams params);