github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added WaitVoice

Browse Source
This commit is contained in:
Brandon Smith
2015-09-04 22:53:45 -03:00
parent 144fe7b570
commit bd803b622a
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Discord.Net/DiscordClient.cs
View File

@@ -667,6 +667,16 @@ namespace Discord
RaiseOnDebugMessage(DebugMessageType.VoiceOutput, $"Cleared the voice buffer."); RaiseOnDebugMessage(DebugMessageType.VoiceOutput, $"Cleared the voice buffer.");
_voiceWebSocket.ClearPCMFrames(); _voiceWebSocket.ClearPCMFrames();
} }
/// <summary> Returns a task that completes once the voice output buffer is empty. </summary>
public async Task WaitVoice()
{
CheckReady();
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
_voiceWebSocket.Wait();
await TaskHelper.CompletedTask;
}
#endif #endif
//Helpers //Helpers

23
src/Discord.Net/DiscordVoiceSocket.cs
View File

@@ -26,7 +26,7 @@ namespace Discord
private OpusEncoder _encoder; private OpusEncoder _encoder;
private ConcurrentQueue<byte[]> _sendQueue; private ConcurrentQueue<byte[]> _sendQueue;
private ManualResetEventSlim _sendQueueWait; private ManualResetEventSlim _sendQueueWait, _sendQueueEmptyWait;
private UdpClient _udp; private UdpClient _udp;
private IPEndPoint _endpoint; private IPEndPoint _endpoint;
private bool _isReady, _isClearing; private bool _isReady, _isClearing;
@@ -45,6 +45,7 @@ namespace Discord
_connectWaitOnLogin = new ManualResetEventSlim(false); _connectWaitOnLogin = new ManualResetEventSlim(false);
_sendQueue = new ConcurrentQueue<byte[]>(); _sendQueue = new ConcurrentQueue<byte[]>();
_sendQueueWait = new ManualResetEventSlim(true); _sendQueueWait = new ManualResetEventSlim(true);
_sendQueueEmptyWait = new ManualResetEventSlim(true);
_encoder = new OpusEncoder(48000, 1, 20, Application.Audio); _encoder = new OpusEncoder(48000, 1, 20, Application.Audio);
_encodingBuffer = new byte[4000]; _encodingBuffer = new byte[4000];
_targetAudioBufferLength = audioBufferLength / 20; _targetAudioBufferLength = audioBufferLength / 20;
@@ -170,10 +171,6 @@ namespace Discord
while (!cancelToken.IsCancellationRequested) while (!cancelToken.IsCancellationRequested)
{ {
//If we have less than our target data buffered, request more
if (_sendQueue.Count < _targetAudioBufferLength)
_sendQueueWait.Set();
double ticksToNextFrame = nextTicks - sw.ElapsedTicks; double ticksToNextFrame = nextTicks - sw.ElapsedTicks;
if (ticksToNextFrame <= 0.0) if (ticksToNextFrame <= 0.0)
{ {
@@ -199,6 +196,16 @@ namespace Discord
} }
timestamp = unchecked(timestamp + samplesPerFrame); timestamp = unchecked(timestamp + samplesPerFrame);
nextTicks += ticksPerFrame; nextTicks += ticksPerFrame;
//If we have less than our target data buffered, request more
int count = _sendQueue.Count;
if (count == 0)
{
_sendQueueWait.Set();
_sendQueueEmptyWait.Set();
}
else if (count < _targetAudioBufferLength)
_sendQueueWait.Set();
} }
} }
} }
@@ -391,6 +398,7 @@ namespace Discord
_sendQueue.Enqueue(payload); _sendQueue.Enqueue(payload);
if (_sendQueue.Count >= _targetAudioBufferLength) if (_sendQueue.Count >= _targetAudioBufferLength)
_sendQueueWait.Reset(); _sendQueueWait.Reset();
_sendQueueEmptyWait.Reset();
} }
public void ClearPCMFrames() public void ClearPCMFrames()
{ {
@@ -412,6 +420,11 @@ namespace Discord
{ {
return new VoiceWebSocketCommands.KeepAlive(); return new VoiceWebSocketCommands.KeepAlive();
} }
public void Wait()
{
_sendQueueEmptyWait.Wait();
}
} }
} }
#endif #endif