zune/ZuneShell.dll
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneShell.dll.git synced 2026-07-27 13:11:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added HTTP streaming support to MFAudioService

Browse Source
This commit is contained in:
Yoshi Askharoun
2022-06-11 22:24:36 -05:00
parent 6b0a436b07
commit 342e1bc71a
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZuneImpl/Playback/MediaFoundationAudioService.cs
+16 -5
View File
@@ -83,19 +83,30 @@ namespace Microsoft.Zune.Playback
{
WaveStream reader = null;
var stream = sourceConfig.MediaConfig.FileStreamSource;
var uri = sourceConfig.MediaConfig.MediaSourceUri;
if (stream != null)
{
reader = new StreamMediaFoundationReader(sourceConfig.MediaConfig.FileStreamSource);
reader = new StreamMediaFoundationReader(stream);
}
else if (sourceConfig.MediaConfig.MediaSourceUri.IsFile)
else if (uri.IsFile)
{
reader = new MediaFoundationReader(sourceConfig.MediaConfig.MediaSourceUri.ToString());
reader = new MediaFoundationReader(uri.ToString());
}
else if (sourceConfig.MediaConfig.MediaSourceUri.Scheme.StartsWith("http"))
else if (uri.Scheme.StartsWith("http"))
{
// Use this URI for testing: https://www.newgrounds.com/audio/download/641172
System.Net.Http.HttpClient client = new();
stream = await client.GetStreamAsync(sourceConfig.MediaConfig.MediaSourceUri, cancellationToken);
var httpStream = await client.GetStreamAsync(uri, cancellationToken);
cancellationToken.ThrowIfCancellationRequested();
// NAudio requires some fancy stuff to stream from the web. This is
// a relatively simple workaround that downloads the entire file
// into memory before playing.
stream = new System.IO.MemoryStream();
await httpStream.CopyToAsync(stream, cancellationToken);
cancellationToken.ThrowIfCancellationRequested();
reader = new StreamMediaFoundationReader(stream);