From 4029e190a3430960b0bcaced149d4850c0f7d028 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Fri, 26 Feb 2021 21:38:27 -0500 Subject: [PATCH 1/3] Update assembly reference for new Fmod version --- Editor/Unity.Recorder.Editor.asmdef | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Editor/Unity.Recorder.Editor.asmdef b/Editor/Unity.Recorder.Editor.asmdef index 28944df..39ffffe 100644 --- a/Editor/Unity.Recorder.Editor.asmdef +++ b/Editor/Unity.Recorder.Editor.asmdef @@ -1,11 +1,12 @@ { "name": "Unity.Recorder.Editor", + "rootNamespace": "", "references": [ "Unity.Recorder.Base", "Unity.Recorder", "Unity.Timeline", - "Fmod.Runtime", - "Clockwork.Core.Harness" + "Clockwork.Core.Harness", + "FMODUnity" ], "includePlatforms": [ "Editor" From d22ff7f58a8121b9fbe2cb232490477d6184ece0 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Sat, 27 Feb 2021 16:21:34 -0500 Subject: [PATCH 2/3] Update for Fmod 2.01.07 --- Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs b/Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs index e67b029..6a0591a 100644 --- a/Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs +++ b/Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using System.Reflection; +using System.Text; using FMOD; using FMODUnity; using Unity.Collections; @@ -127,7 +128,7 @@ public override AudioInputSettings audioSettings private long recordedSamples = 0; public override double audioTime => (double) recordedSamples / sampleRate; - + protected internal override void BeginRecording(RecordingSession session) { m_ChannelCount = new Func(() => { @@ -236,7 +237,7 @@ class FmodAudioInput : AudioInputBase protected internal override void BeginRecording(RecordingSession session) { - var dspName = "RecordSessionVideo(Audio)".ToCharArray(); + var dspName = Encoding.UTF8.GetBytes("RecordSessionVideo(Audio)"); Array.Resize(ref dspName, 32); dspCallback = DspReadCallback; var dspDescription = new DSP_DESCRIPTION From 93cfcaa8cc53cc2a29f6a4e1bf356804c595c28d Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 4 Oct 2022 15:37:57 -0400 Subject: [PATCH 3/3] Update for FMOD 2.02.09 --- Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs b/Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs index 6a0591a..f2c0453 100644 --- a/Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs +++ b/Editor/Sources/Recorders/_Inputs/Audio/AudioInput.cs @@ -232,7 +232,7 @@ class FmodAudioInput : AudioInputBase public override double audioTime => (double) sampleFrames / sampleRate; // Keep a reference to the dsp callback so it doesn't get garbage collected. - private static DSP_READCALLBACK dspCallback; + private static DSP_READ_CALLBACK dspCallback; private DSP dsp; protected internal override void BeginRecording(RecordingSession session)