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

Visual Studio C#7 suggestions

Browse Source
This commit is contained in:
Christopher F
2017-04-23 15:23:06 -04:00
parent 6000b15c4d
commit 431b7fbd9f
21 changed files with 80 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Discord.Net.WebSocket/Audio/AudioClient.cs
View File

@@ -131,8 +131,7 @@ namespace Discord.Audio
await keepaliveTask.ConfigureAwait(false);
_keepaliveTask = null;
long time;
while (_heartbeatTimes.TryDequeue(out time)) { }
while (_heartbeatTimes.TryDequeue(out long time)) { }
_lastMessageTime = 0;
await ClearInputStreamsAsync().ConfigureAwait(false);
@@ -186,8 +185,7 @@ namespace Discord.Audio
}
internal AudioInStream GetInputStream(ulong id)
{
StreamPair streamPair;
if (_streams.TryGetValue(id, out streamPair))
if (_streams.TryGetValue(id, out StreamPair streamPair))
return streamPair.Reader;
return null;
}
@@ -254,8 +252,7 @@ namespace Discord.Audio
{
await _audioLogger.DebugAsync("Received HeartbeatAck").ConfigureAwait(false);
long time;
if (_heartbeatTimes.TryDequeue(out time))
if (_heartbeatTimes.TryDequeue(out long time))
{
int latency = (int)(Environment.TickCount - time);
int before = Latency;

11
src/Discord.Net.WebSocket/Audio/Streams/BufferedWriteStream.cs
View File

@@ -85,8 +85,7 @@ namespace Discord.Audio.Streams
long dist = nextTick - tick;
if (dist <= 0)
{
Frame frame;
if (_queuedFrames.TryDequeue(out frame))
if (_queuedFrames.TryDequeue(out Frame frame))
{
await _client.SetSpeakingAsync(true).ConfigureAwait(false);
_next.WriteHeader(seq++, timestamp, false);
@@ -100,7 +99,7 @@ namespace Discord.Audio.Streams
var _ = _logger?.DebugAsync($"Sent {frame.Bytes} bytes ({_queuedFrames.Count} frames buffered)");
#endif
}
else
else
{
while ((nextTick - tick) <= 0)
{
@@ -135,8 +134,7 @@ namespace Discord.Audio.Streams
cancelToken = _cancelToken;
await _queueLock.WaitAsync(-1, cancelToken).ConfigureAwait(false);
byte[] buffer;
if (!_bufferPool.TryDequeue(out buffer))
if (!_bufferPool.TryDequeue(out byte[] buffer))
{
#if DEBUG
var _ = _logger?.DebugAsync($"Buffer overflow"); //Should never happen because of the queueLock
@@ -166,10 +164,9 @@ namespace Discord.Audio.Streams
}
public override Task ClearAsync(CancellationToken cancelToken)
{
Frame ignored;
do
cancelToken.ThrowIfCancellationRequested();
while (_queuedFrames.TryDequeue(out ignored));
while (_queuedFrames.TryDequeue(out Frame ignored));
return Task.Delay(0);
}
}

3
src/Discord.Net.WebSocket/Audio/Streams/InputStream.cs
View File

@@ -55,9 +55,8 @@ namespace Discord.Audio.Streams
{
cancelToken.ThrowIfCancellationRequested();
RTPFrame frame;
await _signal.WaitAsync(cancelToken).ConfigureAwait(false);
_frames.TryDequeue(out frame);
_frames.TryDequeue(out RTPFrame frame);
return frame;
}

9
src/Discord.Net.WebSocket/Audio/Streams/JitterBuffer.cs
View File

@@ -94,8 +94,7 @@ namespace Discord.Audio.Streams
continue;
}
Frame frame;
if (_queuedFrames.TryPeek(out frame))
if (_queuedFrames.TryPeek(out Frame frame))
{
silenceFrames = 0;
uint distance = (uint)(frame.Timestamp - _timestamp);
@@ -201,7 +200,6 @@ namespace Discord.Audio.Streams
return; //This is an old frame, ignore
}
byte[] buffer;
if (!await _queueLock.WaitAsync(0).ConfigureAwait(false))
{
#if DEBUG
@@ -209,7 +207,7 @@ namespace Discord.Audio.Streams
#endif
return;
}
_bufferPool.TryDequeue(out buffer);
_bufferPool.TryDequeue(out byte[] buffer);
Buffer.BlockCopy(data, offset, buffer, 0, count);
#if DEBUG
@@ -239,10 +237,9 @@ namespace Discord.Audio.Streams
}
public override Task ClearAsync(CancellationToken cancelToken)
{
Frame ignored;
do
cancelToken.ThrowIfCancellationRequested();
while (_queuedFrames.TryDequeue(out ignored));
while (_queuedFrames.TryDequeue(out Frame ignored));
return Task.Delay(0);
}
}