Browse Source

Tweaks to audio docs (#867)

* Tweaks to audio docs

* Make it more obvious that -1 means infinity
tags/2.0.0-beta
Joe4evr Christopher F 7 years ago
parent
commit
e30fd29085
4 changed files with 14 additions and 12 deletions
  1. +2
    -1
      docs/guides/getting_started/samples/intro/structure.cs
  2. +4
    -5
      docs/guides/voice/samples/audio_create_ffmpeg.cs
  3. +7
    -5
      docs/guides/voice/samples/audio_ffmpeg.cs
  4. +1
    -1
      docs/guides/voice/samples/joining_audio.cs

+ 2
- 1
docs/guides/getting_started/samples/intro/structure.cs View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Discord; using Discord;
@@ -88,7 +89,7 @@ class Program
await _client.StartAsync(); await _client.StartAsync();


// Wait infinitely so your bot actually stays connected. // Wait infinitely so your bot actually stays connected.
await Task.Delay(-1);
await Task.Delay(Timeout.Infinite);
} }


private IServiceProvider _services; private IServiceProvider _services;


+ 4
- 5
docs/guides/voice/samples/audio_create_ffmpeg.cs View File

@@ -1,11 +1,10 @@
private Process CreateStream(string path) private Process CreateStream(string path)
{ {
var ffmpeg = new ProcessStartInfo
return Process.Start(new ProcessStartInfo
{ {
FileName = "ffmpeg", FileName = "ffmpeg",
Arguments = $"-i {path} -ac 2 -f s16le -ar 48000 pipe:1",
Arguments = $"-hide_banner -loglevel panic -i \"{path}\" -ac 2 -f s16le -ar 48000 pipe:1",
UseShellExecute = false, UseShellExecute = false,
RedirectStandardOutput = true, RedirectStandardOutput = true,
};
return Process.Start(ffmpeg);
}
});
}

+ 7
- 5
docs/guides/voice/samples/audio_ffmpeg.cs View File

@@ -1,9 +1,11 @@
private async Task SendAsync(IAudioClient client, string path) private async Task SendAsync(IAudioClient client, string path)
{ {
// Create FFmpeg using the previous example // Create FFmpeg using the previous example
var ffmpeg = CreateStream(path);
var output = ffmpeg.StandardOutput.BaseStream;
var discord = client.CreatePCMStream(AudioApplication.Mixed);
await output.CopyToAsync(discord);
await discord.FlushAsync();
using (var ffmpeg = CreateStream(path))
using (var output = ffmpeg.StandardOutput.BaseStream)
using (var discord = client.CreatePCMStream(AudioApplication.Mixed))
{
try { await output.CopyToAsync(discord); }
finally { await discord.FlushAsync(); }
}
} }

+ 1
- 1
docs/guides/voice/samples/joining_audio.cs View File

@@ -7,4 +7,4 @@ public async Task JoinChannel(IVoiceChannel channel = null)


// For the next step with transmitting audio, you would want to pass this Audio Client in to a service. // For the next step with transmitting audio, you would want to pass this Audio Client in to a service.
var audioClient = await channel.ConnectAsync(); var audioClient = await channel.ConnectAsync();
}
}

Loading…
Cancel
Save