Browse Source

Automatically toggle speaking boolean

tags/1.0.0-rc2
RogueException 8 years ago
parent
commit
e49122ea7e
3 changed files with 14 additions and 1 deletions
  1. +1
    -1
      src/Discord.Net.WebSocket/Audio/AudioClient.cs
  2. +3
    -0
      src/Discord.Net.WebSocket/Audio/Streams/BufferedWriteStream.cs
  3. +10
    -0
      src/Discord.Net.WebSocket/Audio/Streams/OutputStream.cs

+ 1
- 1
src/Discord.Net.WebSocket/Audio/AudioClient.cs View File

@@ -239,7 +239,7 @@ namespace Discord.Audio
throw new InvalidOperationException($"Discord selected an unexpected mode: {data.Mode}");

_secretKey = data.SecretKey;
await ApiClient.SendSetSpeaking(true).ConfigureAwait(false);
//await ApiClient.SendSetSpeaking(true).ConfigureAwait(false);

var _ = _connection.CompleteAsync();
}


+ 3
- 0
src/Discord.Net.WebSocket/Audio/Streams/BufferedWriteStream.cs View File

@@ -78,6 +78,7 @@ namespace Discord.Audio.Streams
Frame frame;
if (_queuedFrames.TryDequeue(out frame))
{
await _next.SetSpeakingAsync(true).ConfigureAwait(false);
await _next.WriteAsync(frame.Buffer, 0, frame.Bytes).ConfigureAwait(false);
_bufferPool.Enqueue(frame.Buffer);
_queueLock.Release();
@@ -93,6 +94,8 @@ namespace Discord.Audio.Streams
{
if (_silenceFrames++ < MaxSilenceFrames)
await _next.WriteAsync(_silenceFrame, 0, _silenceFrame.Length).ConfigureAwait(false);
else
await _next.SetSpeakingAsync(false).ConfigureAwait(false);
nextTick += _ticksPerFrame;
}
#if DEBUG


+ 10
- 0
src/Discord.Net.WebSocket/Audio/Streams/OutputStream.cs View File

@@ -6,6 +6,8 @@ namespace Discord.Audio.Streams
///<summary> Wraps an IAudioClient, sending voice data on write. </summary>
public class OutputStream : AudioOutStream
{
private bool _isSpeaking;

private readonly DiscordVoiceAPIClient _client;
public OutputStream(IAudioClient client)
: this((client as AudioClient).ApiClient) { }
@@ -14,6 +16,14 @@ namespace Discord.Audio.Streams
_client = client;
}

public async Task SetSpeakingAsync(bool isSpeaking)
{
if (_isSpeaking != isSpeaking)
{
await _client.SendSetSpeaking(isSpeaking).ConfigureAwait(false);
_isSpeaking = isSpeaking;
}
}
public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
{
cancelToken.ThrowIfCancellationRequested();


Loading…
Cancel
Save