Skip to content

Commit 3fda738

Browse files
walbournwalbourn
committed
May 2017
1 parent 2a9a0db commit 3fda738

File tree

100 files changed

+1482
-14443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1482
-14443
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Microsoft Corp
3+
Copyright (c) 2017 Microsoft Corp
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this
66
software and associated documentation files (the "Software"), to deal in the Software

‎Samples/Audio/AdvancedSpatialSoundsUWP/AdvancedSpatialSoundsUWP.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 17
3+
# Visual Studio 2017
44
VisualStudioVersion = 15.0.26228.10
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedSpatialSoundsUWP", "AdvancedSpatialSoundsUWP.vcxproj", "{AE969795-363C-4230-8D4D-3D02A0156D49}"

‎Samples/Audio/AdvancedSpatialSoundsUWP/AdvancedSpatialSoundsUWP.vcxproj‎

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
@@ -98,11 +98,12 @@
9898
</ImportGroup>
9999
<PropertyGroup Label="UserMacros">
100100
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
101+
<AppxSymbolPackageEnabled>false</AppxSymbolPackageEnabled>
101102
</PropertyGroup>
102103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
103104
<Link>
104-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
105-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm</AdditionalLibraryDirectories>
105+
<AdditionalDependencies>ATGTelemetryUWP.lib; d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
106+
<AdditionalLibraryDirectories>..\..\..\Kits\Telemetry\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm</AdditionalLibraryDirectories>
106107
</Link>
107108
<ClCompile>
108109
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -119,8 +120,8 @@
119120
</ItemDefinitionGroup>
120121
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
121122
<Link>
122-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
123-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm</AdditionalLibraryDirectories>
123+
<AdditionalDependencies>ATGTelemetryUWP.lib; d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
124+
<AdditionalLibraryDirectories>..\..\..\Kits\Telemetry\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm</AdditionalLibraryDirectories>
124125
</Link>
125126
<ClCompile>
126127
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -137,8 +138,8 @@
137138
</ItemDefinitionGroup>
138139
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
139140
<Link>
140-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
141-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib</AdditionalLibraryDirectories>
141+
<AdditionalDependencies>ATGTelemetryUWP.lib; d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
142+
<AdditionalLibraryDirectories>..\..\..\Kits\Telemetry\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib</AdditionalLibraryDirectories>
142143
</Link>
143144
<ClCompile>
144145
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -156,8 +157,8 @@
156157
</ItemDefinitionGroup>
157158
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
158159
<Link>
159-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
160-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib</AdditionalLibraryDirectories>
160+
<AdditionalDependencies>ATGTelemetryUWP.lib; d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
161+
<AdditionalLibraryDirectories>..\..\..\Kits\Telemetry\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib</AdditionalLibraryDirectories>
161162
</Link>
162163
<ClCompile>
163164
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -175,8 +176,8 @@
175176
</ItemDefinitionGroup>
176177
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
177178
<Link>
178-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
179-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64</AdditionalLibraryDirectories>
179+
<AdditionalDependencies>ATGTelemetryUWP.lib; d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
180+
<AdditionalLibraryDirectories>..\..\..\Kits\Telemetry\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64</AdditionalLibraryDirectories>
180181
</Link>
181182
<ClCompile>
182183
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -193,8 +194,8 @@
193194
</ItemDefinitionGroup>
194195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
195196
<Link>
196-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
197-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64</AdditionalLibraryDirectories>
197+
<AdditionalDependencies>ATGTelemetryUWP.lib; d2d1.lib; d3d11.lib; dxgi.lib; dxguid.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies)</AdditionalDependencies>
198+
<AdditionalLibraryDirectories>..\..\..\Kits\Telemetry\$(Platform);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64</AdditionalLibraryDirectories>
198199
</Link>
199200
<ClCompile>
200201
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -287,7 +288,27 @@
287288
</None>
288289
<None Include="Readme.docx" />
289290
</ItemGroup>
290-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
291+
<ItemGroup>
292+
<None Include="..\..\..\Kits\Telemetry\ARM\ATGTelemetryUWP.dll">
293+
<ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
294+
<ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
295+
<DeploymentContent Condition="'$(Platform)'=='ARM'">true</DeploymentContent>
296+
<Link>ATGTelemetryUWP.dll</Link>
297+
</None>
298+
<None Include="..\..\..\Kits\Telemetry\Win32\ATGTelemetryUWP.dll">
299+
<ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
300+
<ExcludedFromBuild Condition="'$(Platform)'=='ARM'">true</ExcludedFromBuild>
301+
<DeploymentContent Condition="'$(Platform)'=='Win32'">true</DeploymentContent>
302+
<Link>ATGTelemetryUWP.dll</Link>
303+
</None>
304+
<None Include="..\..\..\Kits\Telemetry\x64\ATGTelemetryUWP.dll">
305+
<ExcludedFromBuild Condition="'$(Platform)'=='ARM'">true</ExcludedFromBuild>
306+
<ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
307+
<DeploymentContent Condition="'$(Platform)'=='x64'">true</DeploymentContent>
308+
<Link>ATGTelemetryUWP.dll</Link>
309+
</None>
310+
</ItemGroup>
311+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
291312
<ImportGroup Label="ExtensionTargets">
292313
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ImageContentTask.targets" />
293314
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\MeshContentTask.targets" />

‎Samples/Audio/AdvancedSpatialSoundsUWP/AdvancedSpatialSoundsUWP.vcxproj.filters‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<Filter Include="Common">
@@ -11,6 +11,18 @@
1111
<Filter Include="ATG Tool Kit">
1212
<UniqueIdentifier>{2756b903-0a26-4347-84cc-690c257d5545}</UniqueIdentifier>
1313
</Filter>
14+
<Filter Include="Common\Telemetry">
15+
<UniqueIdentifier>{f04fc9a1-d629-4755-ba2e-3d71e3b307db}</UniqueIdentifier>
16+
</Filter>
17+
<Filter Include="Common\Telemetry\ARM">
18+
<UniqueIdentifier>{b7f8ae97-c8eb-41f9-bcb4-f100a2f730d0}</UniqueIdentifier>
19+
</Filter>
20+
<Filter Include="Common\Telemetry\Win32">
21+
<UniqueIdentifier>{ab3bab50-9984-4c69-be32-537423465109}</UniqueIdentifier>
22+
</Filter>
23+
<Filter Include="Common\Telemetry\x64">
24+
<UniqueIdentifier>{debde8dc-79ad-43c5-bf6a-656a5faeba3a}</UniqueIdentifier>
25+
</Filter>
1426
</ItemGroup>
1527
<ItemGroup>
1628
<ClInclude Include="pch.h" />
@@ -137,5 +149,15 @@
137149
<Filter>Assets</Filter>
138150
</None>
139151
<None Include="Readme.docx" />
152+
<None Include="..\..\..\Kits\Telemetry\ARM\ATGTelemetryUWP.dll">
153+
<Filter>Common\Telemetry\ARM</Filter>
154+
</None>
155+
<None Include="..\..\..\Kits\Telemetry\x64\ATGTelemetryUWP.dll">
156+
<Filter>Common\Telemetry\x64</Filter>
157+
</None>
158+
<None Include="..\..\..\Kits\Telemetry\Win32\ATGTelemetryUWP.dll">
159+
<Filter>Common\Telemetry\Win32</Filter>
160+
</None>
161+
140162
</ItemGroup>
141163
</Project>

‎Samples/Audio/AdvancedSpatialSoundsUWP/Main.cpp‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#include <ppltasks.h>
1414

15+
#include "Telemetry.h"
16+
1517
using namespace concurrency;
1618
using namespace Windows::ApplicationModel;
1719
using namespace Windows::ApplicationModel::Core;
@@ -51,6 +53,25 @@ ref class ViewProvider sealed : public IFrameworkView
5153
ref new EventHandler<Platform::Object^>(this, &ViewProvider::OnResuming);
5254

5355
m_sample = std::make_unique<Sample>();
56+
57+
// Sample Usage Telemetry
58+
//
59+
// Disable or remove this code block to opt-out of sample usage telemetry
60+
//
61+
if (ATG::EventRegisterATGSampleTelemetry() == ERROR_SUCCESS)
62+
{
63+
wchar_t exeName[MAX_PATH + 1] = {};
64+
if (!GetModuleFileNameW(nullptr, exeName, MAX_PATH))
65+
{
66+
wcscpy_s(exeName, L"Unknown");
67+
}
68+
wchar_t fname[_MAX_FNAME] = {};
69+
wchar_t ext[_MAX_EXT] = {};
70+
(void)_wsplitpath_s(exeName, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, ext, _MAX_EXT);
71+
(void)_wmakepath_s(exeName, nullptr, nullptr, fname, ext); // keep only the filename + extension
72+
73+
ATG::EventWriteSampleLoaded(exeName);
74+
}
5475
}
5576

5677
virtual void Uninitialize()

‎Samples/Audio/AdvancedSpatialSoundsUWP/Readme.docx‎

455 Bytes
Binary file not shown.

‎Samples/Audio/SimplePlay3DSoundUWP/SimplePlay3DSound.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
</ImportGroup>
9999
<PropertyGroup Label="UserMacros">
100100
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
101+
<AppxSymbolPackageEnabled>false</AppxSymbolPackageEnabled>
101102
</PropertyGroup>
102103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
103104
<Link>

‎Samples/Audio/SimplePlay3DSpatialSoundUWP/Main.cpp‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#include <ppltasks.h>
1414

15+
#include "Telemetry.h"
16+
1517
using namespace concurrency;
1618
using namespace Windows::ApplicationModel;
1719
using namespace Windows::ApplicationModel::Core;
@@ -51,7 +53,26 @@ ref class ViewProvider sealed : public IFrameworkView
5153
ref new EventHandler<Platform::Object^>(this, &ViewProvider::OnResuming);
5254

5355
m_sample = std::make_unique<Sample>();
54-
}
56+
57+
// Sample Usage Telemetry
58+
//
59+
// Disable or remove this code block to opt-out of sample usage telemetry
60+
//
61+
if (ATG::EventRegisterATGSampleTelemetry() == ERROR_SUCCESS)
62+
{
63+
wchar_t exeName[MAX_PATH + 1] = {};
64+
if (!GetModuleFileNameW(nullptr, exeName, MAX_PATH))
65+
{
66+
wcscpy_s(exeName, L"Unknown");
67+
}
68+
wchar_t fname[_MAX_FNAME] = {};
69+
wchar_t ext[_MAX_EXT] = {};
70+
(void)_wsplitpath_s(exeName, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, ext, _MAX_EXT);
71+
(void)_wmakepath_s(exeName, nullptr, nullptr, fname, ext); // keep only the filename + extension
72+
73+
ATG::EventWriteSampleLoaded(exeName);
74+
}
75+
}
5576

5677
virtual void Uninitialize()
5778
{

‎Samples/Audio/SimplePlay3DSpatialSoundUWP/Readme.docx‎

866 Bytes
Binary file not shown.

‎Samples/Audio/SimplePlay3DSpatialSoundUWP/SimplePlay3DSpatialSound.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 17
3+
# Visual Studio 2017
44
VisualStudioVersion = 15.0.26228.10
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimplePlay3DSpatialSound", "SimplePlay3DSpatialSound.vcxproj", "{7C44D58B-2263-4A61-B9CA-2C8777C34F3A}"

0 commit comments

Comments
 (0)