зеркало из https://github.com/mozilla/gecko-dev.git
Bug 859594 - Remove AudioSourceNode; r=bzbarsky
This commit is contained in:
Ehsan Akhgari
Родитель
d95ba48131
Коммит
bc953f2564
|
|
@ -13,13 +13,13 @@
|
|||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(AudioBufferSourceNode, AudioSourceNode, mBuffer)
|
||||
NS_IMPL_CYCLE_COLLECTION_INHERITED_1(AudioBufferSourceNode, AudioNode, mBuffer)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioBufferSourceNode)
|
||||
NS_INTERFACE_MAP_END_INHERITING(AudioSourceNode)
|
||||
NS_INTERFACE_MAP_END_INHERITING(AudioNode)
|
||||
|
||||
NS_IMPL_ADDREF_INHERITED(AudioBufferSourceNode, AudioSourceNode)
|
||||
NS_IMPL_RELEASE_INHERITED(AudioBufferSourceNode, AudioSourceNode)
|
||||
NS_IMPL_ADDREF_INHERITED(AudioBufferSourceNode, AudioNode)
|
||||
NS_IMPL_RELEASE_INHERITED(AudioBufferSourceNode, AudioNode)
|
||||
|
||||
class AudioBufferSourceNodeEngine : public AudioNodeEngine
|
||||
{
|
||||
|
|
@ -220,7 +220,7 @@ public:
|
|||
};
|
||||
|
||||
AudioBufferSourceNode::AudioBufferSourceNode(AudioContext* aContext)
|
||||
: AudioSourceNode(aContext)
|
||||
: AudioNode(aContext)
|
||||
, mLoopStart(0.0)
|
||||
, mLoopEnd(0.0)
|
||||
, mLoop(false)
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
#ifndef AudioBufferSourceNode_h_
|
||||
#define AudioBufferSourceNode_h_
|
||||
|
||||
#include "AudioSourceNode.h"
|
||||
#include "AudioNode.h"
|
||||
#include "AudioBuffer.h"
|
||||
#include "mozilla/dom/BindingUtils.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
class AudioBufferSourceNode : public AudioSourceNode,
|
||||
class AudioBufferSourceNode : public AudioNode,
|
||||
public MainThreadMediaStreamListener
|
||||
{
|
||||
public:
|
||||
|
|
@ -26,12 +26,16 @@ public:
|
|||
if (mStream) {
|
||||
mStream->RemoveMainThreadListener(this);
|
||||
}
|
||||
AudioSourceNode::DestroyMediaStream();
|
||||
AudioNode::DestroyMediaStream();
|
||||
}
|
||||
virtual bool SupportsMediaStreams() const MOZ_OVERRIDE
|
||||
{
|
||||
return true;
|
||||
}
|
||||
virtual uint32_t NumberOfInputs() const MOZ_FINAL MOZ_OVERRIDE
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void JSBindingFinalized()
|
||||
{
|
||||
|
|
@ -40,11 +44,11 @@ public:
|
|||
if (!mStartCalled) {
|
||||
SetProduceOwnOutput(false);
|
||||
}
|
||||
AudioSourceNode::JSBindingFinalized();
|
||||
AudioNode::JSBindingFinalized();
|
||||
}
|
||||
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(AudioBufferSourceNode, AudioSourceNode)
|
||||
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(AudioBufferSourceNode, AudioNode)
|
||||
|
||||
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "AudioSourceNode.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED0(AudioSourceNode, AudioNode)
|
||||
|
||||
AudioSourceNode::AudioSourceNode(AudioContext* aContext)
|
||||
: AudioNode(aContext)
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef AudioSourceNode_h_
|
||||
#define AudioSourceNode_h_
|
||||
|
||||
#include "AudioNode.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
class AudioSourceNode : public AudioNode
|
||||
{
|
||||
public:
|
||||
explicit AudioSourceNode(AudioContext* aContext);
|
||||
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
virtual uint32_t NumberOfInputs() const MOZ_FINAL MOZ_OVERRIDE
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -24,7 +24,6 @@ CPPSRCS := \
|
|||
AudioListener.cpp \
|
||||
AudioNode.cpp \
|
||||
AudioParam.cpp \
|
||||
AudioSourceNode.cpp \
|
||||
BiquadFilterNode.cpp \
|
||||
DelayNode.cpp \
|
||||
DynamicsCompressorNode.cpp \
|
||||
|
|
@ -46,7 +45,6 @@ EXPORTS_mozilla/dom := \
|
|||
AudioListener.h \
|
||||
AudioNode.h \
|
||||
AudioParam.h \
|
||||
AudioSourceNode.h \
|
||||
BiquadFilterNode.h \
|
||||
DelayNode.h \
|
||||
DynamicsCompressorNode.h \
|
||||
|
|
|
|||
|
|
@ -126,10 +126,6 @@ DOMInterfaces = {
|
|||
'nativeOwnership': 'refcounted'
|
||||
},
|
||||
|
||||
'AudioSourceNode': {
|
||||
'concrete': False,
|
||||
},
|
||||
|
||||
'BeforeUnloadEvent': {
|
||||
'nativeType': 'nsDOMBeforeUnloadEvent',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
*/
|
||||
|
||||
[PrefControlled]
|
||||
interface AudioBufferSourceNode : AudioSourceNode {
|
||||
interface AudioBufferSourceNode : AudioNode {
|
||||
|
||||
//const unsigned short UNSCHEDULED_STATE = 0;
|
||||
//const unsigned short SCHEDULED_STATE = 1;
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* The origin of this IDL file is
|
||||
* https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html
|
||||
*
|
||||
* Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
|
||||
* liability, trademark and document use rules apply.
|
||||
*/
|
||||
|
||||
[PrefControlled]
|
||||
interface AudioSourceNode : AudioNode {
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -20,7 +20,6 @@ webidl_files = \
|
|||
AudioListener.webidl \
|
||||
AudioNode.webidl \
|
||||
AudioParam.webidl \
|
||||
AudioSourceNode.webidl \
|
||||
BatteryManager.webidl \
|
||||
BeforeUnloadEvent.webidl \
|
||||
BiquadFilterNode.webidl \
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче