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

Added SpeakingUpdated event

Browse Source
This commit is contained in:
RogueException
2017-04-01 13:12:41 -03:00
parent 35e793fd9a
commit 5229ddb579
2 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Discord.Net.WebSocket/Audio/AudioClient.Events.cs Normal file
View File

@@ -0,0 +1,46 @@
using Discord.Audio;
using System;
using System.Threading.Tasks;
namespace Discord.Audio
{
internal partial class AudioClient
{
public event Func<Task> Connected
{
add { _connectedEvent.Add(value); }
remove { _connectedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<Task>> _connectedEvent = new AsyncEvent<Func<Task>>();
public event Func<Exception, Task> Disconnected
{
add { _disconnectedEvent.Add(value); }
remove { _disconnectedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<Exception, Task>> _disconnectedEvent = new AsyncEvent<Func<Exception, Task>>();
public event Func<int, int, Task> LatencyUpdated
{
add { _latencyUpdatedEvent.Add(value); }
remove { _latencyUpdatedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<int, int, Task>> _latencyUpdatedEvent = new AsyncEvent<Func<int, int, Task>>();
public event Func<ulong, AudioInStream, Task> StreamCreated
{
add { _streamCreatedEvent.Add(value); }
remove { _streamCreatedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<ulong, AudioInStream, Task>> _streamCreatedEvent = new AsyncEvent<Func<ulong, AudioInStream, Task>>();
public event Func<ulong, Task> StreamDestroyed
{
add { _streamDestroyedEvent.Add(value); }
remove { _streamDestroyedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<ulong, Task>> _streamDestroyedEvent = new AsyncEvent<Func<ulong, Task>>();
public event Func<ulong, bool, Task> SpeakingUpdated
{
add { _speakingUpdatedEvent.Add(value); }
remove { _speakingUpdatedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<ulong, bool, Task>> _speakingUpdatedEvent = new AsyncEvent<Func<ulong, bool, Task>>();
}
}

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

@@ -15,7 +15,7 @@ using System.Threading.Tasks;
namespace Discord.Audio
{
//TODO: Add audio reconnecting
internal class AudioClient : IAudioClient, IDisposable
internal partial class AudioClient : IAudioClient, IDisposable
{
internal struct StreamPair
{
@@ -29,37 +29,6 @@ namespace Discord.Audio
}
}
public event Func<Task> Connected
{
add { _connectedEvent.Add(value); }
remove { _connectedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<Task>> _connectedEvent = new AsyncEvent<Func<Task>>();
public event Func<Exception, Task> Disconnected
{
add { _disconnectedEvent.Add(value); }
remove { _disconnectedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<Exception, Task>> _disconnectedEvent = new AsyncEvent<Func<Exception, Task>>();
public event Func<int, int, Task> LatencyUpdated
{
add { _latencyUpdatedEvent.Add(value); }
remove { _latencyUpdatedEvent.Remove(value); }
}
private readonly AsyncEvent<Func<int, int, Task>> _latencyUpdatedEvent = new AsyncEvent<Func<int, int, Task>>();
public event Func<ulong, AudioInStream, Task> StreamCreated
{
add { _streamCreated.Add(value); }
remove { _streamCreated.Remove(value); }
}
private readonly AsyncEvent<Func<ulong, AudioInStream, Task>> _streamCreated = new AsyncEvent<Func<ulong, AudioInStream, Task>>();
public event Func<ulong, Task> StreamDestroyed
{
add { _streamDestroyed.Add(value); }
remove { _streamDestroyed.Remove(value); }
}
private readonly AsyncEvent<Func<ulong, Task>> _streamDestroyed = new AsyncEvent<Func<ulong, Task>>();
private readonly Logger _audioLogger;
private readonly JsonSerializer _serializer;
private readonly ConnectionManager _connection;
@@ -202,7 +171,7 @@ namespace Discord.Audio
var readerStream = new InputStream();
var writerStream = new OpusDecodeStream(new RTPReadStream(readerStream, _secretKey));
_streams.TryAdd(userId, new StreamPair(readerStream, writerStream));
await _streamCreated.InvokeAsync(userId, readerStream);
await _streamCreatedEvent.InvokeAsync(userId, readerStream);
}
}
internal AudioInStream GetInputStream(ulong id)
@@ -215,14 +184,14 @@ namespace Discord.Audio
internal async Task RemoveInputStreamAsync(ulong userId)
{
if (_streams.TryRemove(userId, out var ignored))
await _streamDestroyed.InvokeAsync(userId).ConfigureAwait(false);
await _streamDestroyedEvent.InvokeAsync(userId).ConfigureAwait(false);
}
internal async Task ClearInputStreamsAsync()
{
foreach (var pair in _streams)
{
pair.Value.Reader.Dispose();
await _streamDestroyed.InvokeAsync(pair.Key).ConfigureAwait(false);
await _streamDestroyedEvent.InvokeAsync(pair.Key).ConfigureAwait(false);
}
_ssrcMap.Clear();
_streams.Clear();
@@ -287,6 +256,8 @@ namespace Discord.Audio
var data = (payload as JToken).ToObject<SpeakingEvent>(_serializer);
_ssrcMap[data.Ssrc] = data.UserId; //TODO: Memory Leak: SSRCs are never cleaned up
await _speakingUpdatedEvent.InvokeAsync(data.UserId, data.Speaking);
}
break;
default: