Merge branch 'master' into mac
This commit is contained in:
@@ -7,17 +7,17 @@
|
||||
/// <summary>
|
||||
/// Represents a single audio device.
|
||||
/// </summary>
|
||||
API_CLASS(NoSpawn) class AudioDevice : public PersistentScriptingObject
|
||||
API_CLASS(NoSpawn) class AudioDevice : public ScriptingObject
|
||||
{
|
||||
DECLARE_SCRIPTING_TYPE_NO_SPAWN(AudioDevice);
|
||||
|
||||
explicit AudioDevice()
|
||||
: PersistentScriptingObject(SpawnParams(Guid::New(), TypeInitializer))
|
||||
: ScriptingObject(SpawnParams(Guid::New(), TypeInitializer))
|
||||
{
|
||||
}
|
||||
|
||||
AudioDevice(const AudioDevice& other)
|
||||
: PersistentScriptingObject(SpawnParams(Guid::New(), TypeInitializer))
|
||||
: ScriptingObject(SpawnParams(Guid::New(), TypeInitializer))
|
||||
{
|
||||
Name = other.Name;
|
||||
InternalName = other.InternalName;
|
||||
|
||||
Reference in New Issue
Block a user