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

Cleaned up extension projects, added fluent extension methods

Browse Source
This commit is contained in:
RogueException
2016-01-05 00:11:35 -04:00
parent 55ed6cd783
commit 55c5f0dade
29 changed files with 303 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Discord.Net.Audio/Net/WebSockets/VoiceWebSocket.cs → src/Discord.Net.Audio/Net/VoiceWebSocket.cs
View File

@@ -49,6 +49,14 @@ namespace Discord.Net.WebSockets
public int Ping => _ping;
internal VoiceBuffer OutputBuffer => _sendBuffer;
internal event EventHandler<InternalIsSpeakingEventArgs> UserIsSpeaking = delegate { };
internal event EventHandler<InternalFrameEventArgs> FrameReceived = delegate { };
private void OnUserIsSpeaking(ulong userId, bool isSpeaking)
=> UserIsSpeaking(this, new InternalIsSpeakingEventArgs(userId, isSpeaking));
internal void OnFrameReceived(ulong userId, ulong channelId, byte[] buffer, int offset, int count)
=> FrameReceived(this, new InternalFrameEventArgs(userId, channelId, buffer, offset, count));
internal VoiceWebSocket(DiscordClient client, AudioClient audioClient, JsonSerializer serializer, Logger logger)
: base(client, serializer, logger)
{
@@ -58,7 +66,7 @@ namespace Discord.Net.WebSockets
_targetAudioBufferLength = _config.BufferLength / 20; //20 ms frames
_encodingBuffer = new byte[MaxOpusSize];
_ssrcMapping = new ConcurrentDictionary<uint, ulong>();
_encoder = new OpusEncoder(48000, _config.Channels, 20, _config.Bitrate, OpusApplication.Audio);
_encoder = new OpusEncoder(48000, _config.Channels, 20, _config.Bitrate, OpusApplication.MusicOrMixed);
_sendBuffer = new VoiceBuffer((int)Math.Ceiling(_config.BufferLength / (double)_encoder.FrameLength), _encoder.FrameSize);
}
@@ -223,7 +231,7 @@ namespace Discord.Net.WebSockets
ulong userId;
if (_ssrcMapping.TryGetValue(ssrc, out userId))
RaiseOnPacket(userId, Channel.Id, result, resultOffset, resultLength);
OnFrameReceived(userId, Channel.Id, result, resultOffset, resultLength);
}
}
}
@@ -440,7 +448,7 @@ namespace Discord.Net.WebSockets
case OpCodes.Speaking:
{
var payload = (msg.Payload as JToken).ToObject<SpeakingEvent>(_serializer);
RaiseIsSpeaking(payload.UserId, payload.IsSpeaking);
OnUserIsSpeaking(payload.UserId, payload.IsSpeaking);
}
break;
default:
@@ -449,9 +457,9 @@ namespace Discord.Net.WebSockets
}
}
public void SendPCMFrames(byte[] data, int bytes)
public void SendPCMFrames(byte[] data, int offset, int count)
{
_sendBuffer.Push(data, bytes, CancelToken);
_sendBuffer.Push(data, offset, count, CancelToken);
}
public void ClearPCMFrames()
{

33
src/Discord.Net.Audio/Net/WebSockets/VoiceWebSocket.Events.cs
View File

@@ -1,33 +0,0 @@
using Discord.Audio;
using System;
namespace Discord.Net.WebSockets
{
internal sealed class IsTalkingEventArgs : EventArgs
{
public readonly ulong UserId;
public readonly bool IsSpeaking;
internal IsTalkingEventArgs(ulong userId, bool isTalking)
{
UserId = userId;
IsSpeaking = isTalking;
}
}
public partial class VoiceWebSocket
{
internal event EventHandler<IsTalkingEventArgs> IsSpeaking;
private void RaiseIsSpeaking(ulong userId, bool isSpeaking)
{
if (IsSpeaking != null)
IsSpeaking(this, new IsTalkingEventArgs(userId, isSpeaking));
}
internal event EventHandler<VoicePacketEventArgs> OnPacket;
internal void RaiseOnPacket(ulong userId, ulong channelId, byte[] buffer, int offset, int count)
{
if (OnPacket != null)
OnPacket(this, new VoicePacketEventArgs(userId, channelId, buffer, offset, count));
}
}
}