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

Moved voice functions from API to base file.

Browse Source
This commit is contained in:
Brandon Smith
2015-09-04 20:34:30 -03:00
parent f0933c75a0
commit 0cde7c3dd2
2 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Discord.Net/DiscordClient.API.cs
View File

@@ -470,57 +470,6 @@ namespace Discord
return _api.Undeafen(serverId, userId);
}
#if !DNXCORE50
public Task JoinVoiceServer(string channelId)
=> JoinVoiceServer(_channels[channelId]);
public async Task JoinVoiceServer(Channel channel)
{
CheckReady();
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
if (channel == null) throw new ArgumentNullException(nameof(channel));
await LeaveVoiceServer();
_currentVoiceServerId = channel.ServerId;
_webSocket.JoinVoice(channel);
}
public async Task LeaveVoiceServer()
{
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
await _voiceWebSocket.DisconnectAsync();
if (_currentVoiceServerId != null)
_webSocket.LeaveVoice();
_currentVoiceServerId = null;
_currentVoiceToken = null;
}
/// <summary> Sends a PCM frame to the voice server. </summary>
/// <param name="data">PCM frame to send.</param>
/// <param name="count">Number of bytes in this frame. </param>
public void SendVoicePCM(byte[] data, int count)
{
CheckReady();
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
if (count == 0) return;
if (_isDebugMode)
RaiseOnDebugMessage(DebugMessageType.VoiceOutput, $"Queued {count} bytes for voice output.");
_voiceWebSocket.SendPCMFrame(data, count);
}
/// <summary> Clears the PCM buffer. </summary>
public void ClearVoicePCM()
{
CheckReady();
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
if (_isDebugMode)
RaiseOnDebugMessage(DebugMessageType.VoiceOutput, $"Cleared the voice buffer.");
_voiceWebSocket.ClearPCMFrames();
}
#endif
//Profile
/// <summary> Changes your username to newName. </summary>
public async Task ChangeUsername(string newName, string currentEmail, string currentPassword)

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

@@ -616,6 +616,58 @@ namespace Discord
}
}
//Voice
#if !DNXCORE50
public Task JoinVoiceServer(string channelId)
=> JoinVoiceServer(_channels[channelId]);
public async Task JoinVoiceServer(Channel channel)
{
CheckReady();
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
if (channel == null) throw new ArgumentNullException(nameof(channel));
await LeaveVoiceServer();
_currentVoiceServerId = channel.ServerId;
_webSocket.JoinVoice(channel);
}
public async Task LeaveVoiceServer()
{
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
await _voiceWebSocket.DisconnectAsync();
if (_currentVoiceServerId != null)
_webSocket.LeaveVoice();
_currentVoiceServerId = null;
_currentVoiceToken = null;
}
/// <summary> Sends a PCM frame to the voice server. </summary>
/// <param name="data">PCM frame to send.</param>
/// <param name="count">Number of bytes in this frame. </param>
public void SendVoicePCM(byte[] data, int count)
{
CheckReady();
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
if (count == 0) return;
if (_isDebugMode)
RaiseOnDebugMessage(DebugMessageType.VoiceOutput, $"Queued {count} bytes for voice output.");
_voiceWebSocket.SendPCMFrame(data, count);
}
/// <summary> Clears the PCM buffer. </summary>
public void ClearVoicePCM()
{
CheckReady();
if (!_config.EnableVoice) throw new InvalidOperationException("Voice is not enabled for this client.");
if (_isDebugMode)
RaiseOnDebugMessage(DebugMessageType.VoiceOutput, $"Cleared the voice buffer.");
_voiceWebSocket.ClearPCMFrames();
}
#endif
//Helpers
private void CheckReady()
{