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

Merge pull request #167 from DigiTechs/audio

Browse Source 
Finish SocketVoiceChannel.ConnectAsync
This commit is contained in:
RogueException
2016-08-01 03:46:58 -03:00
committed by GitHub
parent f0a9f7cbbb c3dc8cd15a
commit d9b5cd6c98
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Discord.Net/WebSocket/Entities/Channels/SocketVoiceChannel.cs
View File

@@ -45,8 +45,9 @@ namespace Discord
await Discord.ApiClient.SendVoiceStateUpdateAsync(Guild.Id, Id, await Discord.ApiClient.SendVoiceStateUpdateAsync(Guild.Id, Id,
(audioMode & AudioMode.Incoming) == 0, (audioMode & AudioMode.Incoming) == 0,
(audioMode & AudioMode.Outgoing) == 0).ConfigureAwait(false); (audioMode & AudioMode.Outgoing) == 0).ConfigureAwait(false);
return null;
//TODO: Block and return await Guild.AudioConnectPromise.ConfigureAwait(false);
return Guild.AudioClient;
} }
public SocketVoiceChannel Clone() => MemberwiseClone() as SocketVoiceChannel; public SocketVoiceChannel Clone() => MemberwiseClone() as SocketVoiceChannel;

14
src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs
View File

@@ -24,7 +24,7 @@ namespace Discord
internal override bool IsAttached => true; internal override bool IsAttached => true;
private readonly SemaphoreSlim _audioLock; private readonly SemaphoreSlim _audioLock;
private TaskCompletionSource<bool> _syncPromise, _downloaderPromise; private TaskCompletionSource<bool> _syncPromise, _downloaderPromise, _audioConnectPromise;
private ConcurrentHashSet<ulong> _channels; private ConcurrentHashSet<ulong> _channels;
private ConcurrentDictionary<ulong, SocketGuildUser> _members; private ConcurrentDictionary<ulong, SocketGuildUser> _members;
private ConcurrentDictionary<ulong, VoiceState> _voiceStates; private ConcurrentDictionary<ulong, VoiceState> _voiceStates;
@@ -39,6 +39,7 @@ namespace Discord
public bool IsSynced => _syncPromise.Task.IsCompleted; public bool IsSynced => _syncPromise.Task.IsCompleted;
public Task SyncPromise => _syncPromise.Task; public Task SyncPromise => _syncPromise.Task;
public Task DownloaderPromise => _downloaderPromise.Task; public Task DownloaderPromise => _downloaderPromise.Task;
public Task AudioConnectPromise => _audioConnectPromise.Task;
public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient; public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient;
public SocketGuildUser CurrentUser => GetUser(Discord.CurrentUser.Id); public SocketGuildUser CurrentUser => GetUser(Discord.CurrentUser.Id);
@@ -306,7 +307,16 @@ namespace Discord
{ {
_audioLock.Release(); _audioLock.Release();
} }
await audioClient.ConnectAsync(url, CurrentUser.Id, voiceState.VoiceSessionId, token).ConfigureAwait(false);
try
{
await audioClient.ConnectAsync(url, CurrentUser.Id, voiceState.VoiceSessionId, token).ConfigureAwait(false);
await _audioConnectPromise.TrySetResultAsync(true).ConfigureAwait(false);
}
catch(Exception e)
{
await _audioConnectPromise.SetExceptionAsync(e).ConfigureAwait(false);
}
} }
public SocketGuild Clone() => MemberwiseClone() as SocketGuild; public SocketGuild Clone() => MemberwiseClone() as SocketGuild;