Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert O'Callahan 2012-10-25 23:09:39 +13:00
parent 9bfc64887e
commit 0e15bb86af
8 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/media/nsAudioStream.cpp
View File

@ -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;
}

2
dom/ipc/AudioParent.cpp
View File

@ -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();

2
dom/ipc/AudioParent.h
View File

@ -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);

3
dom/ipc/ContentChild.cpp
View File

@ -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();

1
dom/ipc/ContentChild.h
View File

@ -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*);

5
dom/ipc/ContentParent.cpp
View File

@ -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

1
dom/ipc/ContentParent.h
View File

@ -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*);

2
dom/ipc/PContent.ipdl
View File

@ -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);