fix multiple wasapi listeners

This commit is contained in:
ntr committed 2022-03-25 16:20:41 +11:00
1 parent 4833faed56
commit 0285b0a11c
5 files changed
+100 -14

No files matched your search

+69 -1
View File
@@ -1,5 +1,72 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &4011236396290952328
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1729957376054616780}
- component: {fileID: 4411218952747006310}
- component: {fileID: 1740187066128017440}
m_Layer: 5
m_Name: Kaiju
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1729957376054616780
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4011236396290952328}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5305278010342315827}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 256, y: -64}
m_SizeDelta: {x: 400, y: 400}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4411218952747006310
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4011236396290952328}
m_CullTransparentMesh: 1
--- !u!114 &1740187066128017440
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4011236396290952328}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ef8b96895a0ec4ba685178a052544251, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 3286163911610860551, guid: c50f3ace9fc08934fb2a5bd9b3f30ae0, type: 3}
m_PreserveAspect: 1
--- !u!1 &5305278009141335879 --- !u!1 &5305278009141335879
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -17,7 +84,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &5305278009141335878 --- !u!224 &5305278009141335878
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -190,6 +257,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 5305278009141335878} - {fileID: 5305278009141335878}
- {fileID: 5305278009821670018} - {fileID: 5305278009821670018}
- {fileID: 1729957376054616780}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -17,8 +17,7 @@ namespace Assets.WasapiAudio.Scripts.Unity
public int MaxFrequency = 20000; public int MaxFrequency = 20000;
public WasapiAudioFilter[] Filters; public WasapiAudioFilter[] Filters;
public void Awake() public void Awake() {
{
// Setup loopback audio and start listening // Setup loopback audio and start listening
_wasapiAudio = new Core.WasapiAudio(CaptureType, SpectrumSize, ScalingStrategy, MinFrequency, MaxFrequency, Filters, spectrumData => _wasapiAudio = new Core.WasapiAudio(CaptureType, SpectrumSize, ScalingStrategy, MinFrequency, MaxFrequency, Filters, spectrumData =>
{ {
@@ -28,18 +27,11 @@ namespace Assets.WasapiAudio.Scripts.Unity
_wasapiAudio.StartListen(); _wasapiAudio.StartListen();
} }
public void Update() public float[] GetSpectrumData() {
{
}
public float[] GetSpectrumData()
{
return _spectrumData; return _spectrumData;
} }
public void OnApplicationQuit() void OnDestroy() {
{
_wasapiAudio?.StopListen(); _wasapiAudio?.StopListen();
} }
} }
+1
View File
@@ -11,6 +11,7 @@
"com.unity.textmeshpro": "3.0.6", "com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.3", "com.unity.timeline": "1.6.3",
"com.unity.ugui": "1.0.0", "com.unity.ugui": "1.0.0",
"com.unity.vectorgraphics": "2.0.0-preview.18",
"com.unity.visualeffectgraph": "10.8.1", "com.unity.visualeffectgraph": "10.8.1",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
+25
View File
@@ -1,5 +1,11 @@
{ {
"dependencies": { "dependencies": {
"com.unity.2d.sprite": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {}
},
"com.unity.cinemachine": { "com.unity.cinemachine": {
"version": "2.8.3", "version": "2.8.3",
"depth": 0, "depth": 0,
@@ -154,6 +160,25 @@
"com.unity.modules.imgui": "1.0.0" "com.unity.modules.imgui": "1.0.0"
} }
}, },
"com.unity.vectorgraphics": {
"version": "2.0.0-preview.18",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.ugui": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.visualeffectgraph": { "com.unity.visualeffectgraph": {
"version": "10.8.1", "version": "10.8.1",
"depth": 0, "depth": 0,
+2 -2
View File
@@ -12,11 +12,11 @@ MonoBehaviour:
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_EnablePreviewPackages: 0 m_EnablePreviewPackages: 1
m_EnablePackageDependencies: 0 m_EnablePackageDependencies: 0
m_AdvancedSettingsExpanded: 1 m_AdvancedSettingsExpanded: 1
m_ScopedRegistriesSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1
oneTimeWarningShown: 0 oneTimeWarningShown: 1
m_Registries: m_Registries:
- m_Id: main - m_Id: main
m_Name: m_Name: