80ab27df22
commit 409d4d96ead69028a164274637d23e350acb73fb Merge: 95169f539 26e89c63d Author: EdusFF <pitkanen.eetu@gmail.com> Date: Mon Mar 11 15:13:27 2019 +0200 Merge branch 'dev' of github.com:Regalis11/Barotrauma into dev commit 95169f53937f9a7e168a884171eaa21ae7f08023 Author: EdusFF <pitkanen.eetu@gmail.com> Date: Mon Mar 11 15:13:11 2019 +0200 Modified: ServerMessage structure to allow _ ; in player & submarine names commit 26e89c63dc8da771aea9f09978a630a6cff60a6f Merge: b7646d06d fb0b821bc Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 14:42:44 2019 +0200 Merge branch 'kuraiookami-logicExpantion' into dev # Conflicts: # Barotrauma/BarotraumaShared/SharedContent.projitems commit fb0b821bc97891cdeec8f2c740a12119696393ea Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 14:41:21 2019 +0200 Use invariant culture when parsing floats or converting them to strings in signal components commit f0c8afba934b41358cf5d59a22b87caf33f98a61 Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 14:00:44 2019 +0200 Update new signal components to use identifiers & added names and descriptions to the text file, use invariant culture in equalscomponent, memorycomponent doesn't require the signals to be floats commit 674d9ec804fc4770b602d4b09240b08cafc8ccec Merge: 3ea33fb54 242e2429f Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 12:01:27 2019 +0200 Merge branch 'logicExpantion' of https://github.com/kuraiookami/Barotrauma into kuraiookami-logicExpantion # Conflicts: # Barotrauma/BarotraumaShared/BarotraumaShared.projitems # Barotrauma/BarotraumaShared/Content/Items/Electricity/poweritems.xml # Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml # Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs # Barotrauma/BarotraumaShared/Source/Items/Components/Signal/AdderComponent.cs commit b7646d06d53fb05227276e6286d0e15da5dc9080 Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 11:37:33 2019 +0200 Re-enabled multiplayer campaign commit cf7258f6410a5995c881ec6e95eb9def5cd90ad4 Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 11:28:48 2019 +0200 Fixed item interfaces getting repositioned every frame when the editing HUD is open. Closes #1212 commit e8906239c779cf71de694bc65c81058e5cae16ef Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Mon Mar 11 11:12:05 2019 +0200 Fixed VoipCapture creating new "could not start voice capture" popups constantly if there's no suitable capture device. Closes #1262 commit a30f47fbe47fde4fccb0453c1773a76d730d226b Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Sun Mar 10 19:04:59 2019 +0200 Disable audio instead of crashing if no audio device is found. Closes #1214 commit 242e2429fd2c3ed199ac26b55e2cbdc8636e73f9 Author: Darkwolf <Darkwolf0101@gmail.com> Date: Mon Jan 21 21:26:57 2019 -0600 Expansion of Barotrauma's logic system. Changed: - AdderComponent and children can clamp their output - Powercontainer signals for charge,charge% and charge rate Added: - ColorComponent: Dynamic signals for light set_color inputs - MemoryComponent: Stores and sends a signal that is edge latched - DivideComponent: Standard division - MultiplyComponent: Standard multiplication - SubtractComponent: Standard subtraction - XorComponent: Exclusive or - EqualsComponent: Equals comparison - GreaterComponent: Greater than comparison
229 lines
7.2 KiB
C#
229 lines
7.2 KiB
C#
using Lidgren.Network;
|
|
using OpenTK.Audio.OpenAL;
|
|
using System;
|
|
using System.Linq;
|
|
using System.Runtime.InteropServices;
|
|
using System.Threading;
|
|
|
|
namespace Barotrauma.Networking
|
|
{
|
|
class VoipCapture : VoipQueue, IDisposable
|
|
{
|
|
public static VoipCapture Instance
|
|
{
|
|
get;
|
|
private set;
|
|
}
|
|
|
|
private IntPtr captureDevice;
|
|
|
|
private Thread captureThread;
|
|
|
|
private bool capturing;
|
|
|
|
public double LastdB
|
|
{
|
|
get;
|
|
private set;
|
|
}
|
|
|
|
public DateTime LastEnqueueAudio;
|
|
|
|
public override byte QueueID
|
|
{
|
|
get
|
|
{
|
|
return GameMain.Client?.ID ?? 0;
|
|
}
|
|
protected set
|
|
{
|
|
//do nothing
|
|
}
|
|
}
|
|
|
|
public static void Create(string deviceName, UInt16? storedBufferID=null)
|
|
{
|
|
if (Instance != null)
|
|
{
|
|
throw new Exception("Tried to instance more than one VoipCapture object");
|
|
}
|
|
|
|
var capture = new VoipCapture(deviceName)
|
|
{
|
|
LatestBufferID = storedBufferID ?? BUFFER_COUNT - 1
|
|
};
|
|
if (capture.captureDevice != IntPtr.Zero)
|
|
{
|
|
Instance = capture;
|
|
}
|
|
}
|
|
|
|
private VoipCapture(string deviceName) : base(GameMain.Client?.ID ?? 0, true, false)
|
|
{
|
|
VoipConfig.SetupEncoding();
|
|
|
|
//set up capture device
|
|
captureDevice = Alc.CaptureOpenDevice(deviceName, VoipConfig.FREQUENCY, ALFormat.Mono16, VoipConfig.BUFFER_SIZE * 5);
|
|
|
|
if (captureDevice == IntPtr.Zero)
|
|
{
|
|
if (!GUIMessageBox.MessageBoxes.Any(mb => mb.UserData as string == "capturedevicenotfound"))
|
|
{
|
|
new GUIMessageBox(TextManager.Get("Error"), TextManager.Get("VoipCaptureDeviceNotFound"))
|
|
{
|
|
UserData = "capturedevicenotfound"
|
|
};
|
|
}
|
|
GameMain.Config.VoiceSetting = GameSettings.VoiceMode.Disabled;
|
|
Instance?.Dispose();
|
|
Instance = null;
|
|
return;
|
|
}
|
|
|
|
ALError alError = AL.GetError();
|
|
AlcError alcError = Alc.GetError(captureDevice);
|
|
if (alcError != AlcError.NoError)
|
|
{
|
|
throw new Exception("Failed to open capture device: " + alcError.ToString() + " (ALC)");
|
|
}
|
|
if (alError != ALError.NoError)
|
|
{
|
|
throw new Exception("Failed to open capture device: " + alError.ToString() + " (AL)");
|
|
}
|
|
|
|
Alc.CaptureStart(captureDevice);
|
|
alcError = Alc.GetError(captureDevice);
|
|
if (alcError != AlcError.NoError)
|
|
{
|
|
throw new Exception("Failed to start capturing: " + alcError.ToString());
|
|
}
|
|
|
|
capturing = true;
|
|
captureThread = new Thread(UpdateCapture)
|
|
{
|
|
IsBackground = true,
|
|
Name = "VoipCapture"
|
|
};
|
|
captureThread.Start();
|
|
}
|
|
|
|
public static void ChangeCaptureDevice(string deviceName)
|
|
{
|
|
GameMain.Config.VoiceCaptureDevice = deviceName;
|
|
|
|
if (Instance != null)
|
|
{
|
|
UInt16 storedBufferID = Instance.LatestBufferID;
|
|
Instance.Dispose();
|
|
Create(GameMain.Config.VoiceCaptureDevice, storedBufferID);
|
|
}
|
|
}
|
|
|
|
void UpdateCapture()
|
|
{
|
|
short[] uncompressedBuffer = new short[VoipConfig.BUFFER_SIZE];
|
|
while (capturing)
|
|
{
|
|
AlcError alcError;
|
|
Alc.GetInteger(captureDevice, AlcGetInteger.CaptureSamples, 1, out int sampleCount);
|
|
|
|
alcError = Alc.GetError(captureDevice);
|
|
if (alcError != AlcError.NoError)
|
|
{
|
|
throw new Exception("Failed to determine sample count: " + alcError.ToString());
|
|
}
|
|
|
|
if (sampleCount < VoipConfig.BUFFER_SIZE)
|
|
{
|
|
int sleepMs = (VoipConfig.BUFFER_SIZE - sampleCount) * 800 / VoipConfig.FREQUENCY;
|
|
if (sleepMs < 5) sleepMs = 5;
|
|
Thread.Sleep(sleepMs);
|
|
continue;
|
|
}
|
|
|
|
GCHandle handle = GCHandle.Alloc(uncompressedBuffer, GCHandleType.Pinned);
|
|
try
|
|
{
|
|
Alc.CaptureSamples(captureDevice, handle.AddrOfPinnedObject(), VoipConfig.BUFFER_SIZE);
|
|
}
|
|
finally
|
|
{
|
|
handle.Free();
|
|
}
|
|
|
|
alcError = Alc.GetError(captureDevice);
|
|
if (alcError != AlcError.NoError)
|
|
{
|
|
throw new Exception("Failed to capture samples: " + alcError.ToString());
|
|
}
|
|
|
|
double maxAmplitude = 0.0f;
|
|
for (int i = 0; i < VoipConfig.BUFFER_SIZE; i++)
|
|
{
|
|
double sampleVal = (double)uncompressedBuffer[i] / (double)short.MaxValue;
|
|
maxAmplitude = Math.Max(maxAmplitude, Math.Abs(sampleVal));
|
|
}
|
|
double dB = Math.Min(20 * Math.Log10(maxAmplitude), 0.0);
|
|
|
|
LastdB = dB;
|
|
|
|
bool allowEnqueue = false;
|
|
if (GameMain.WindowActive)
|
|
{
|
|
if (GameMain.Config.VoiceSetting == GameSettings.VoiceMode.Activity)
|
|
{
|
|
if (dB > GameMain.Config.NoiseGateThreshold)
|
|
{
|
|
allowEnqueue = true;
|
|
}
|
|
}
|
|
else if (GameMain.Config.VoiceSetting == GameSettings.VoiceMode.PushToTalk)
|
|
{
|
|
if (PlayerInput.KeyDown(InputType.Voice) && GUI.KeyboardDispatcher.Subscriber == null)
|
|
{
|
|
allowEnqueue = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (allowEnqueue)
|
|
{
|
|
LastEnqueueAudio = DateTime.Now;
|
|
//encode audio and enqueue it
|
|
lock (buffers)
|
|
{
|
|
int compressedCount = VoipConfig.Encoder.Encode(uncompressedBuffer, 0, VoipConfig.BUFFER_SIZE, BufferToQueue, 0, VoipConfig.MAX_COMPRESSED_SIZE);
|
|
EnqueueBuffer(compressedCount);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
//enqueue silence
|
|
lock (buffers)
|
|
{
|
|
EnqueueBuffer(0);
|
|
}
|
|
}
|
|
|
|
Thread.Sleep(VoipConfig.BUFFER_SIZE * 800 / VoipConfig.FREQUENCY);
|
|
}
|
|
}
|
|
|
|
public override void Write(NetBuffer msg)
|
|
{
|
|
lock (buffers)
|
|
{
|
|
base.Write(msg);
|
|
}
|
|
}
|
|
|
|
public override void Dispose()
|
|
{
|
|
Instance = null;
|
|
capturing = false;
|
|
captureThread?.Join();
|
|
captureThread = null;
|
|
}
|
|
}
|
|
}
|