From 8f5a20c21a0a9295f2e0124cc2b4839c303dba2a Mon Sep 17 00:00:00 2001 From: Raymond Chen Date: Wed, 17 Aug 2016 17:00:00 -0700 Subject: [PATCH] Windows 10 RTM Release - August 2016 Update 4 --- README.md | 20 +++++++++---------- .../cs/AudioCreation/Scenario4_Submix.xaml | 18 ++++++++--------- .../cs/AudioCreation/Scenario4_Submix.xaml.cs | 2 +- .../cs/CustomEffect/CustomEffect.cs | 14 +++++++++---- 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index e8209b73b1..a84ed963e5 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,15 @@ samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=619979&clcid=0x409 ---> -# Universal Windows app samples +# Universal Windows Platform (UWP) app samples -This repo contains the samples that demonstrate the API usage patterns for the Universal Windows Platform (UWP) in the Windows Software Development Kit (SDK) for Windows 10. These code samples were created with the Universal Windows templates available in Visual Studio, and are designed to run on desktop, mobile, and future devices that support the Universal Windows Platform. +This repo contains the samples that demonstrate the API usage patterns for the Universal Windows Platform (UWP) in the Windows Software Development Kit (SDK) for Windows 10. These code samples were created with the Universal Windows Platform templates available in Visual Studio, and are designed to run on desktop, mobile, and future devices that support the Universal Windows Platform. ## Universal Windows Platform development -These samples require Visual Studio 2015 and the Windows Software Development Kit (SDK) for Windows 10 to build, test, and deploy your Universal Windows apps. +These samples require Visual Studio 2015 and the Windows Software Development Kit (SDK) for Windows 10 to build, test, and deploy your Universal Windows Platform apps. - [Get a free copy of Visual Studio 2015 Community Edition with support for building Universal Windows apps](http://go.microsoft.com/fwlink/?LinkID=280676) + [Get a free copy of Visual Studio 2015 Community Edition with support for building Universal Windows Platform apps](http://go.microsoft.com/fwlink/p/?LinkID=280676) Additionally, to stay on top of the latest updates to Windows and the development tools, become a Windows Insider by joining the Windows Insider Program. @@ -18,27 +18,27 @@ Additionally, to stay on top of the latest updates to Windows and the developmen ## Using the samples -The easiest way to use these samples without using Git is to download the zip file containing the current version (using the link below or by clicking the "Download ZIP" button on the repo page). You can then unzip the entire archive and use the samples in Visual Studio 2015. +The easiest way to use these samples without using Git is to download the zip file containing the current version (using the following link or by clicking the "Download ZIP" button on the repo page). You can then unzip the entire archive and use the samples in Visual Studio 2015. [Download the samples ZIP](../../archive/master.zip) **Notes:** - * Before you unzip the archive, right-click it, select Properties, and then select Unblock. + * Before you unzip the archive, right-click it, select **Properties**, and then select **Unblock**. * Be sure to unzip the entire archive, and not just individual samples. The samples all depend on the SharedContent folder in the archive. * In Visual Studio 2015, the platform target defaults to ARM, so be sure to change that to x64 or x86 if you want to test on a non-ARM device. -The samples use Linked files in Visual Studio to reduce duplication of common files, including sample template files and image assets. These common files are stored in the SharedContent folder at the root of the repository and referred to in the project files using links. +The samples use Linked files in Visual Studio to reduce duplication of common files, including sample template files and image assets. These common files are stored in the SharedContent folder at the root of the repository, and are referred to in the project files using links. **Reminder:** If you unzip individual samples, they will not build due to references to other portions of the ZIP file that were not unzipped. You must unzip the entire archive if you intend to build the samples. -For more info about the programming models, platforms, languages, and APIs demonstrated in these samples, please refer to the guidance, tutorials, and reference topics provided in the Windows 10 documentation available in the [Windows Developer Center](http://go.microsoft.com/fwlink/?LinkID=532421). These samples are provided as-is in order to indicate or demonstrate the functionality of the programming models and feature APIs for Windows. +For more info about the programming models, platforms, languages, and APIs demonstrated in these samples, please refer to the guidance, tutorials, and reference topics provided in the Windows 10 documentation available in the [Windows Developer Center](http://go.microsoft.com/fwlink/p/?LinkID=532421). These samples are provided as-is in order to indicate or demonstrate the functionality of the programming models and feature APIs for Windows. ## Contributions -These samples are direct from the feature teams and we welcome your input on issues and suggestions for new samples. At this time we are not accepting new samples from the public, but check back here as we evolve our contribution model. +These samples are direct from the feature teams and we welcome your input on issues and suggestions for new samples. At this time we are not accepting new samples from the public, but check back here as we evolve our contribution model. This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) +For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. ## See also diff --git a/Samples/AudioCreation/cs/AudioCreation/Scenario4_Submix.xaml b/Samples/AudioCreation/cs/AudioCreation/Scenario4_Submix.xaml index fdf7d1c8fb..04f78ef3ad 100644 --- a/Samples/AudioCreation/cs/AudioCreation/Scenario4_Submix.xaml +++ b/Samples/AudioCreation/cs/AudioCreation/Scenario4_Submix.xaml @@ -33,14 +33,14 @@ - - + + - - + + @@ -60,14 +60,14 @@ - - + + - - + + @@ -110,7 +110,7 @@ - + diff --git a/Samples/AudioCreation/cs/AudioCreation/Scenario4_Submix.xaml.cs b/Samples/AudioCreation/cs/AudioCreation/Scenario4_Submix.xaml.cs index 59da53ed6c..1d9a26921c 100644 --- a/Samples/AudioCreation/cs/AudioCreation/Scenario4_Submix.xaml.cs +++ b/Samples/AudioCreation/cs/AudioCreation/Scenario4_Submix.xaml.cs @@ -237,7 +237,7 @@ private async Task CreateAudioGraph() speakerContainer.Background = new SolidColorBrush(Colors.Green); submixNode = graph.CreateSubmixNode(); - subMixNode.Background = new SolidColorBrush(Colors.Green); + submixNodeContainer.Background = new SolidColorBrush(Colors.Green); submixNode.AddOutgoingConnection(deviceOutputNode); echoEffect = new EchoEffectDefinition(graph); diff --git a/Samples/AudioCreation/cs/CustomEffect/CustomEffect.cs b/Samples/AudioCreation/cs/CustomEffect/CustomEffect.cs index 64f4c5cd33..a7233cba81 100644 --- a/Samples/AudioCreation/cs/CustomEffect/CustomEffect.cs +++ b/Samples/AudioCreation/cs/CustomEffect/CustomEffect.cs @@ -30,12 +30,18 @@ public sealed class AudioEchoEffect : IBasicAudioEffect // Mix does not have a set - all updates should be done through the property set. private float Mix { - get { return (float)propertySet["Mix"]; } + get + { + object val; + if (propertySet != null && propertySet.TryGetValue("Mix", out val)) + { + return (float)val; + } + return .5f; + } } public bool UseInputFrameForOutput { get { return false; } } - public bool TimeIndependent { get { return true; } } - public bool IsReadyOnly { get { return true; } } // Set up constant members in the constructor public AudioEchoEffect() @@ -100,7 +106,7 @@ unsafe public void ProcessFrame(ProcessAudioFrameContext context) inputData = inputDataInFloat[i] * (1.0f - this.Mix); echoData = echoBuffer[currentActiveSampleIndex] * this.Mix; outputDataInFloat[i] = inputData + echoData; - echoBuffer[currentActiveSampleIndex] = inputData; + echoBuffer[currentActiveSampleIndex] = inputDataInFloat[i]; currentActiveSampleIndex++; if (currentActiveSampleIndex == echoBuffer.Length)